rpms/xen/devel xen-fix-deprecated-warnings.patch, NONE, 1.1 xen.spec, 1.234, 1.235
Gerd Hoffmann
kraxel at fedoraproject.org
Tue Mar 10 10:21:53 UTC 2009
Author: kraxel
Update of /cvs/pkgs/rpms/xen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4450
Modified Files:
xen.spec
Added Files:
xen-fix-deprecated-warnings.patch
Log Message:
fix python 2.6 warnings
xen-fix-deprecated-warnings.patch:
--- NEW FILE xen-fix-deprecated-warnings.patch ---
diff -up xen-3.3.1/tools/python/xen/util/acmpolicy.py.deprecated xen-3.3.1/tools/python/xen/util/acmpolicy.py
--- xen-3.3.1/tools/python/xen/util/acmpolicy.py.deprecated 2009-03-09 17:22:39.000000000 +0100
+++ xen-3.3.1/tools/python/xen/util/acmpolicy.py 2009-03-09 17:23:09.000000000 +0100
@@ -17,7 +17,7 @@
#============================================================================
import os
-import sha
+import hashlib
import stat
import array
import struct
@@ -1103,7 +1103,7 @@ class ACMPolicy(XSPolicy):
def hash(self):
""" Calculate a SAH1 hash of the XML policy """
- return sha.sha(self.toxml())
+ return hashlib.sha1(self.toxml())
def save(self):
### Save the XML policy into a file ###
diff -up xen-3.3.1/tools/python/xen/xend/XendAPI.py.deprecated xen-3.3.1/tools/python/xen/xend/XendAPI.py
--- xen-3.3.1/tools/python/xen/xend/XendAPI.py.deprecated 2009-03-10 11:16:47.000000000 +0100
+++ xen-3.3.1/tools/python/xen/xend/XendAPI.py 2009-03-10 11:17:34.000000000 +0100
@@ -18,7 +18,6 @@
import inspect
import os
import Queue
-import sets
import string
import sys
import traceback
@@ -116,7 +115,7 @@ event_registrations = {}
def event_register(session, reg_classes):
if session not in event_registrations:
event_registrations[session] = {
- 'classes' : sets.Set(),
+ 'slasses' : set(),
'queue' : Queue.Queue(EVENT_QUEUE_LENGTH),
'next-id' : 1
}
Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- xen.spec 6 Mar 2009 11:26:51 -0000 1.234
+++ xen.spec 10 Mar 2009 10:21:22 -0000 1.235
@@ -2,7 +2,7 @@
# Always set these 3 tags
%define base_version 3.3.1
-%define base_release 9
+%define base_release 10
# Hypervisor ABI
%define hv_abi 3.3
@@ -67,6 +67,7 @@
Source14: grub-0.97.tar.gz
Patch1: xen-initscript.patch
Patch2: xen-initscript-pvops.patch
+Patch3: xen-fix-deprecated-warnings.patch
Patch8: xen-xenstore-cli.patch
Patch13: xen-dumpdir.patch
Patch14: xen-net-disable-bridge-by-default.patch
@@ -168,6 +169,7 @@
%setup -q -n %{directory_tag}
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%patch8 -p1
%patch13 -p1
@@ -500,6 +502,9 @@
%{_libdir}/*.a
%changelog
+* Tue Mar 10 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.3.1-10
+- fix python 2.6 warnings.
+
* Fri Mar 6 2009 Gerd Hoffmann <kraxel at redhat.com> - 3.3.1-9
- fix xen.modules init script for pv_ops kernel.
- stick rpm release tag into XEN_VENDORVERSION.
More information about the scm-commits
mailing list