Fixes for compatibility with Python 2.4.

Signed-off-by: Chris Lalancette <clalance@redhat.com>

oz-customize

@@ -105,7 +105,7 @@ try:
         raise Exception, "libvirt XML file is too big!"
 
     guest.customize(open(libvirt_xml_file, 'r').read())
-except Exception as exc:
+except Exception, exc:
     if loglevel > logging.DEBUG:
         print ""
         print "ERROR: %s" % (str(exc))

oz-generate-icicle

@@ -105,7 +105,7 @@ try:
         raise Exception, "libvirt XML file is too big!"
 
     print guest.generate_icicle(open(libvirt_xml_file, 'r').read())
-except Exception as exc:
+except Exception, exc:
     if loglevel > logging.DEBUG:
         print ""
         print "ERROR: %s" % (str(exc))

oz-install

@@ -132,11 +132,12 @@ try:
     if libvirt_xml is None:
         guest.generate_install_media(force_download)
         try:
-            guest.generate_diskimage()
-            libvirt_xml = guest.install(timeout)
-        except:
-            guest.cleanup_old_guest()
-            raise
+            try:
+                guest.generate_diskimage()
+                libvirt_xml = guest.install(timeout)
+            except:
+                guest.cleanup_old_guest()
+                raise
         finally:
             guest.cleanup_install()
 
@@ -150,7 +151,7 @@ try:
     filename = guest.name + time.strftime("%b_%d_%Y-%H:%M:%S")
     open(filename, 'w').write(libvirt_xml)
     print "Libvirt XML was written to " + filename
-except Exception as exc:
+except Exception, exc:
     if loglevel > logging.DEBUG:
         print ""
         print "ERROR: %s" % (str(exc))

oz.spec.in

@@ -19,9 +19,10 @@ Requires: libvirt-python
 # unless/until we are able to make it really be remote.
 Requires: libvirt
 Requires: python-pycurl
-Requires: genisoimage
+Requires: mkisofs
 Requires: numpy
 Requires: mtools
+Requires: python-uuid
 
 %description
 Oz is a set of libraries and utilities for doing automated guest OS