diff --git a/python-virtinst.spec b/python-virtinst.spec index 68ea84d..c9b7624 100644 --- a/python-virtinst.spec +++ b/python-virtinst.spec @@ -11,7 +11,7 @@ Summary: Python modules for starting Xen guest installations Name: python-%{appname} Version: 0.200.0 -Release: 3%{_extra_release} +Release: 4%{_extra_release} Source0: http://virt-manager.et.redhat.com/download/sources/%{appname}/%{appname}-%{version}.tar.gz License: GPL Group: Development/Libraries @@ -27,6 +27,7 @@ Obsoletes: python-xeninst < 0.97.0 Patch1: %{appname}-%{version}-default-arch.patch Patch2: %{appname}-%{version}-cdrom-src.patch Patch3: %{appname}-%{version}-kvm-kernel.patch +Patch4: %{appname}-%{version}-distro-fetch.patch %description virtinst is a module to help in starting installations of Fedora/Red @@ -43,6 +44,7 @@ virtinst in a command line mode. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build python setup.py build @@ -71,6 +73,10 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/virt-clone %changelog +* Tue Nov 20 2007 Daniel P. Berrange - 0.200.0-4.fc7 +- Fixed install of F8 distros (rhbz 391211) +- Fixed validity checking of NFS locations (rhbz 370221) + * Thu Sep 6 2007 Daniel P. Berrange - 0.200.0-3.fc7 - Fixed CDROM source post-install (rhbz #260981) - Fixed kernel for post-install config with KVM guests diff --git a/virtinst-0.200.0-distro-fetch.patch b/virtinst-0.200.0-distro-fetch.patch new file mode 100644 index 0000000..e27d584 --- /dev/null +++ b/virtinst-0.200.0-distro-fetch.patch @@ -0,0 +1,22 @@ +diff -rup virtinst-0.200.0.orig/virtinst/DistroManager.py virtinst-0.200.0.new/virtinst/DistroManager.py +--- virtinst-0.200.0.orig/virtinst/DistroManager.py 2007-07-18 22:04:21.000000000 -0400 ++++ virtinst-0.200.0.new/virtinst/DistroManager.py 2007-11-20 07:25:43.000000000 -0500 +@@ -161,7 +161,7 @@ class MountedImageFetcher(ImageFetcher): + if tmpfile is not None: + os.unlink(tmpfile) + return True +- except RuntimeError, e: ++ except Exception, e: + logging.debug("Cannot find file %s" % filename) + return False + +@@ -210,6 +210,9 @@ class RedHatImageStore(ImageStore): + # Fedora distro check + class FedoraImageStore(RedHatImageStore): + def isValidStore(self, fetcher, progresscb): ++ if fetcher.hasFile("fedora.css", progresscb): ++ logging.debug("Detected a Fedora distro") ++ return True + if fetcher.hasFile("Fedora", progresscb): + logging.debug("Detected a Fedora distro") + return True