[fedora-virt-maint] rpms/python-virtinst/F-9 virtinst-0.400.2-fix-file.patch, NONE, 1.1 python-virtinst.spec, 1.46, 1.47

[Cole Robinson]

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30413

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.400.2-fix-file.patch 
Log Message:
Fix virt-install --file option (bz 488731)


virtinst-0.400.2-fix-file.patch:

--- NEW FILE virtinst-0.400.2-fix-file.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1236265193 18000
# Node ID eae3579380dd2112393e0011c1b3212243c39d94
# Parent  8a1d27ec3458e1639f01d05a5d5d691f7e83baeb
Fix using virt-install --file (it's outright broken)

diff -r 8a1d27ec3458 -r eae3579380dd virt-install
--- a/virt-install	Thu Mar 05 09:58:15 2009 -0500
+++ b/virt-install	Thu Mar 05 09:59:53 2009 -0500
@@ -168,7 +168,8 @@
 
     if not devtype:
         devtype = virtinst.VirtualDisk.DEVICE_DISK
-    ret = (abspath, voltuple, volinst, devtype, bus, ro, shared, size, sparse, cache)
+    ret = (abspath, voltuple, volinst, devtype, bus, ro, shared, size, sparse,
+           cache)
     logging.debug("parse_disk: returning %s" % str(ret))
     return ret
 
@@ -178,9 +179,9 @@
         # Get disk parameters
         if is_file_path:
             (path, voltuple, volinst, device, bus, readOnly, shared, size,
-             sparse) = \
+             sparse, cache) = \
              (disk, None, None, virtinst.VirtualDisk.DEVICE_DISK, None, False,
-              False, size, sparse)
+              False, size, sparse, None)
         else:
             (path, voltuple, volinst,
              device, bus, readOnly, shared,


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-9/python-virtinst.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- python-virtinst.spec	4 Mar 2009 17:44:06 -0000	1.46
+++ python-virtinst.spec	5 Mar 2009 15:24:46 -0000	1.47
@@ -11,9 +11,10 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.400.2
-Release: 1%{_extra_release}
+Release: 2%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{appname}-%{version}-update-polish-trans.patch
+Patch2: %{appname}-%{version}-fix-file.patch
 License: GPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -40,6 +41,7 @@
 %prep
 %setup -q -n %{appname}-%{version}
 %patch1 -p1
+%patch2 -p1
 
 %build
 python setup.py build
@@ -73,6 +75,9 @@
 %{_bindir}/virt-convert
 
 %changelog
+* Thu Mar  5 2009 Cole Robinson <crobinso at redhat.com> - 0.400.2-2.fc9
+- Fix virt-install --file option (bz 488731)
+
 * Wed Mar  4 2009 Cole Robinson <crobinso at redhat.com> - 0.400.2-1.fc9
 - Update to version 0.400.2
 - virt-install --import option for creating a guest from an existing disk