diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-10-22 07:35:36 +0100 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-10-22 07:35:36 +0100 |
| commit | 44d95809c515f3207960665b9ba1b640168446f7 (patch) | |
| tree | 17a1963ca716f31c4196f9678a0779180d687a33 /tools/pygrub/setup.py | |
| parent | 3eeb70411201ae16b2920ccaa3a9a5df81fb6627 (diff) | |
| download | xen-44d95809c515f3207960665b9ba1b640168446f7.tar.gz xen-44d95809c515f3207960665b9ba1b640168446f7.tar.bz2 xen-44d95809c515f3207960665b9ba1b640168446f7.zip | |
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@mulix.org>
Diffstat (limited to 'tools/pygrub/setup.py')
| -rw-r--r-- | tools/pygrub/setup.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tools/pygrub/setup.py b/tools/pygrub/setup.py index 5e0937bbad..88a06d6de1 100644 --- a/tools/pygrub/setup.py +++ b/tools/pygrub/setup.py @@ -12,14 +12,11 @@ if os.path.exists("/usr/include/ext2fs/ext2_fs.h"): 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, |