rpms/python-virtinst/devel python-virtinst-0.300.0-fedora8-distro.patch, NONE, 1.1 python-virtinst.spec, 1.23, 1.24 virtinst-0.200.0-default-arch.patch, 1.1, NONE

[Daniel P. Berrange (berrange)]

Author: berrange

Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2239

Modified Files:
	python-virtinst.spec 
Added Files:
	python-virtinst-0.300.0-fedora8-distro.patch 
Removed Files:
	virtinst-0.200.0-default-arch.patch 
Log Message:
Fixed detection of F8 distro layout (rhbz #273781)

python-virtinst-0.300.0-fedora8-distro.patch:

--- NEW FILE python-virtinst-0.300.0-fedora8-distro.patch ---
changeset:   268:6b4684756fcf
user:        "Daniel P. Berrange <berrange at redhat.com>"
date:        Tue Sep 11 21:20:02 2007 -0400
files:       virtinst/DistroManager.py
description:
Fix detection of Fedora distros for latest F8 style trees


diff -r a6d47ed6c97c -r 6b4684756fcf virtinst/DistroManager.py
--- a/virtinst/DistroManager.py	Wed Aug 29 18:25:09 2007 -0400
+++ b/virtinst/DistroManager.py	Tue Sep 11 21:20:02 2007 -0400
@@ -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

changeset:   269:39d2c56e9895
tag:         tip
user:        "Daniel P. Berrange <berrange at redhat.com>"
date:        Tue Sep 11 21:20:30 2007 -0400
files:       virtinst/FullVirtGuest.py
description:
Fix typo in Fedora 8 distro name


diff -r 6b4684756fcf -r 39d2c56e9895 virtinst/FullVirtGuest.py
--- a/virtinst/FullVirtGuest.py	Tue Sep 11 21:20:02 2007 -0400
+++ b/virtinst/FullVirtGuest.py	Tue Sep 11 21:20:30 2007 -0400
@@ -34,7 +34,7 @@ class FullVirtGuest(Guest.XenGuest):
                                           "fedora5": { "label": "Fedora Core 5", "distro": "fedora" }, \
                                           "fedora6": { "label": "Fedora Core 6", "distro": "fedora" }, \
                                           "fedora7": { "label": "Fedora 7", "distro": "fedora" }, \
-                                          "fedora8": { "label": "Fedora 7", "distro": "fedora" }, \
+                                          "fedora8": { "label": "Fedora 8", "distro": "fedora" }, \
                                           "sles10": { "label": "Suse Linux Enterprise Server", "distro": "suse" }, \
                                           "generic24": { "label": "Generic 2.4.x kernel" }, \
                                           "generic26": { "label": "Generic 2.6.x kernel" }, \



Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- python-virtinst.spec	29 Aug 2007 22:38:15 -0000	1.23
+++ python-virtinst.spec	12 Sep 2007 01:31:44 -0000	1.24
@@ -11,8 +11,9 @@
 Summary: Python modules for starting Xen guest installations
 Name: python-%{appname}
 Version: 0.300.0
-Release: 1%{_extra_release}
+Release: 2%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
+Patch1: %{name}-%{version}-fedora8-distro.patch
 License: GPL
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q -n %{appname}-%{version}
+%patch1 -p1
 
 %build
 python setup.py build
@@ -64,7 +66,10 @@
 %{_bindir}/virt-image
 
 %changelog
-* Wed Aug 29 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-1
+* Tue Sep 11 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-2.fc8
+- Fixed detection of Fedora 8 distro trees (rhbz #273781)
+
+* Wed Aug 29 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.0-1.fc8
 - Updated to 0.300.0
 - Added virt-image tool
 - Switched to calling virsh console and virt-viewer


--- virtinst-0.200.0-default-arch.patch DELETED ---