rpms/python-virtinst/FC-6 virtinst-0.200.0-distro-fetch.patch, NONE, 1.1 python-virtinst.spec, 1.7, 1.8

[fedora-cvs-commits redhat com]

Author: berrange

Update of /cvs/dist/rpms/python-virtinst/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv30128

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.200.0-distro-fetch.patch 
Log Message:
Fixed install of F8 guests & NFS checks

virtinst-0.200.0-distro-fetch.patch:
 DistroManager.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE virtinst-0.200.0-distro-fetch.patch ---
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


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/dist/rpms/python-virtinst/FC-6/python-virtinst.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-virtinst.spec	26 Jul 2007 15:14:55 -0000	1.7
+++ python-virtinst.spec	20 Nov 2007 12:33:46 -0000	1.8
@@ -11,7 +11,7 @@
 Summary: Python modules for starting Xen guest installations
 Name: python-%{appname}
 Version: 0.200.0
-Release: 2%{_extra_release}
+Release: 3%{_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 @@
 BuildRequires: python-devel
 Obsoletes: python-xeninst < 0.97.0
 Patch1: %{appname}-%{version}-default-arch.patch
+Patch2: %{appname}-%{version}-distro-fetch.patch
 
 %description
 virtinst is a module to help in starting installations of Fedora/Red
@@ -41,6 +42,7 @@
 %prep
 %setup -q -n %{appname}-%{version}
 %patch1 -p1
+%patch2 -p1
 
 %build
 python setup.py build
@@ -73,6 +75,10 @@
 %{_bindir}/virt-clone
 
 %changelog
+* Tue Nov 20 2007 Daniel P. Berrange <berrange redhat com> - 0.200.0-3.fc6
+- Fixed install of F8 distros (rhbz 391211)
+- Fixed validity checking of NFS locations (rhbz 370221)
+
 * Thu Jul 26 2007 Daniel P. Berrange <berrange redhat com> - 0.200.0-2.fc6
 - Fixed default architecture