cardoe      09/05/27 16:33:09

  Added:                virtinst-0.400.3-kvm-img.patch
  Log:
  add patch to use kvm-img if qemu-img isn't there
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-emulation/virtinst/files/virtinst-0.400.3-kvm-img.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtinst/files/virtinst-0.400.3-kvm-img.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtinst/files/virtinst-0.400.3-kvm-img.patch?rev=1.1&content-type=text/plain

Index: virtinst-0.400.3-kvm-img.patch
===================================================================
diff -Nur virtinst-0.400.3/virtconv/diskcfg.py virtinst-0.400.3-kvm-img/virtconv/diskcfg.py
--- virtinst-0.400.3/virtconv/diskcfg.py	2009-03-09 22:32:15.000000000 -0500
+++ virtinst-0.400.3-kvm-img/virtconv/diskcfg.py	2009-05-20 10:55:13.000000000 -0500
@@ -151,12 +151,17 @@
         Use qemu-img to convert the given disk.  Note that at least some
         version of qemu-img cannot handle multi-file VMDKs, so this can
         easily go wrong.
+        Gentoo, Debian, and Ubuntu (potentially others) install kvm-img
+        with kvm and qemu-img with qemu. Both would work.
         """
 
         self.clean += [ absout ]
 
         ret, ignore, stderr = run_cmd(["qemu-img", "convert", "-O",
             qemu_formats[out_format], absin, absout])
+        if ret = 127:
+            ret, ignore, stderr = run_cmd(["kvm-img", "convert", "-O",
+                qemu_formats[out_format], absin, absout])
         if ret != 0:
             raise RuntimeError("Disk conversion failed with "
                 "exit status %d: %s" % (ret, "".join(stderr)))