rpms/python-virtinst/F-12 virtinst-0.500.1-location-cdrom.patch, NONE, 1.1 python-virtinst.spec, 1.77, 1.78

[Cole Robinson]

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2541

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.500.1-location-cdrom.patch 
Log Message:
virt-install: Fix --location dvd.iso (bz 584141)


virtinst-0.500.1-location-cdrom.patch:
 DistroInstaller.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE virtinst-0.500.1-location-cdrom.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at redhat.com>
# Date 1273170531 14400
# Node ID 666e8b658272b5897dc49765f643932b6b97465f
# Parent  dea9100e5bf2f6c4dd543054f906f0709064fef4
Fix virt-install --location dvd.iso

diff -r dea9100e5bf2 -r 666e8b658272 virtinst/DistroInstaller.py
--- a/virtinst/DistroInstaller.py	Wed May 12 10:21:24 2010 -0400
+++ b/virtinst/DistroInstaller.py	Thu May 06 14:28:51 2010 -0400
@@ -274,7 +274,10 @@
     # General Installer methods
 
     def scratchdir_required(self):
-        return bool(not self._location_is_path)
+        is_url = not self._location_is_path
+        mount_dvd = self._location_is_path and not self.cdrom
+
+        return bool(is_url or mount_dvd)
 
     def prepare(self, guest, meter, distro = None):
         self.cleanup()


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-12/python-virtinst.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- python-virtinst.spec	22 Mar 2010 00:37:10 -0000	1.77
+++ python-virtinst.spec	7 Jul 2010 20:32:19 -0000	1.78
@@ -17,7 +17,7 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.500.1
-Release: 3%{_extra_release}
+Release: 4%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 # Fix interface API detection for libvirt < 0.7.4
 Patch1: %{appname}-%{version}-fix-interface-detect.patch
@@ -25,6 +25,8 @@ Patch1: %{appname}-%{version}-fix-interf
 Patch2: %{appname}-%{version}-fix-disk-prompt.patch
 # Improve clone progress reporting (bz 550870)
 Patch3: %{appname}-%{version}-improve-clone-progress.patch
+# virt-install: Fix --location dvd.iso (bz 584141)
+Patch4: %{appname}-%{version}-location-cdrom.patch
 
 License: GPLv2+
 Group: Development/Libraries
@@ -55,6 +57,7 @@ and install new VMs) and virt-clone (clo
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 python setup.py build
@@ -90,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Wed Jul 07 2010 Cole Robinson <crobinso at redhat.com> - 0.500.1-4.fc12
+- virt-install: Fix --location dvd.iso (bz 584141)
+
 * Sun Mar 21 2010 Cole Robinson <crobinso at redhat.com> - 0.500.1-3.fc12
 - virt-install: Fix --disk with --prompt (bz 560579)
 - Improve clone progress reporting (bz 550870)