diff --git a/virt-manager.changes b/virt-manager.changes index f07228fe..d2b5b02a 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 1 08:02:37 MST 2014 - carnold@suse.com + +- bnc#907319 - virt-manager: Unable to complete install: 'local + variable 'distro_distro' referenced before assignment + virtinst-detect-suse-distros.patch updated + ------------------------------------------------------------------- Sat Nov 08 17:54:00 UTC 2014 - Led diff --git a/virt-manager.spec b/virt-manager.spec index 8fc5d8ca..6cd4b409 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define with_guestfs 0 %define askpass_package "openssh-askpass" %define qemu_user "qemu" diff --git a/virtinst-detect-suse-distros.patch b/virtinst-detect-suse-distros.patch index 6aba0b2e..5fe0a9b6 100644 --- a/virtinst-detect-suse-distros.patch +++ b/virtinst-detect-suse-distros.patch @@ -2,7 +2,7 @@ Index: virt-manager-1.1.0/virtinst/urlfetcher.py =================================================================== --- virt-manager-1.1.0.orig/virtinst/urlfetcher.py +++ virt-manager-1.1.0/virtinst/urlfetcher.py -@@ -321,6 +321,88 @@ def _distroFromTreeinfo(fetcher, arch, v +@@ -321,6 +321,89 @@ def _distroFromTreeinfo(fetcher, arch, v return ob @@ -15,6 +15,7 @@ Index: virt-manager-1.1.0/virtinst/urlfetcher.py + distribution = None + distro_version = None + distro_summary = None ++ distro_distro = None + distro_arch = None + filename = fetcher.acquireFile("content") + cbuf = f = None @@ -91,7 +92,7 @@ Index: virt-manager-1.1.0/virtinst/urlfetcher.py def getDistroStore(guest, fetcher): stores = [] -@@ -337,6 +419,10 @@ def getDistroStore(guest, fetcher): +@@ -337,6 +420,10 @@ def getDistroStore(guest, fetcher): if dist: return dist @@ -102,7 +103,7 @@ Index: virt-manager-1.1.0/virtinst/urlfetcher.py stores = _allstores[:] # If user manually specified an os_distro, bump it's URL class -@@ -819,29 +905,59 @@ class SLDistro(RHELDistro): +@@ -819,29 +906,59 @@ class SLDistro(RHELDistro): class SuseDistro(Distro): name = "SUSE" @@ -171,7 +172,7 @@ Index: virt-manager-1.1.0/virtinst/urlfetcher.py return True def _get_method_arg(self): -@@ -861,6 +977,27 @@ class SuseDistro(Distro): +@@ -861,6 +978,27 @@ class SuseDistro(Distro): return osobj.name return self.os_variant