[Xen-changelog] Two patches were applied to pygrub's setup.py to work around python2.2

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 3951b5b01cfdbdd3157d40cc7c764853d0594690
# Parent  21a211649fe26af8f4565dd0a032a6d0dced0862
Two patches were applied to pygrub's setup.py to work around python2.2
limitations and only one is needed. Revert one of them.

Signed-Off-By: Muli Ben-Yehuda <mulix@xxxxxxxxx>

diff -r 21a211649fe2 -r 3951b5b01cfd tools/pygrub/setup.py
--- a/tools/pygrub/setup.py     Fri Oct 21 19:07:54 2005
+++ b/tools/pygrub/setup.py     Sat Oct 22 06:35:36 2005
@@ -12,14 +12,11 @@
     ext2defines = []
     cc = new_compiler()
     cc.add_library("ext2fs")
-    try:
-        if hasattr(cc, "has_function") and cc.has_function("ext2fs_open2"):
-            ext2defines.append( ("HAVE_EXT2FS_OPEN2", None) )
-        else:
-            sys.stderr.write("WARNING: older version of e2fsprogs installed, 
not building full\n")
-            sys.stderr.write("         disk support for ext2.\n")
-    except AttributeError:
-        pass
+    if hasattr(cc, "has_function") and cc.has_function("ext2fs_open2"):
+        ext2defines.append( ("HAVE_EXT2FS_OPEN2", None) )
+    else:
+        sys.stderr.write("WARNING: older version of e2fsprogs installed, not 
building full\n")
+        sys.stderr.write("         disk support for ext2.\n")
         
     ext2 = Extension("grub.fsys.ext2._pyext2",
                      extra_compile_args = extra_compile_args,

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog