- bnc#907319 - virt-manager: Unable to complete install: 'local

variable 'distro_distro' referenced before assignment 
  virtinst-detect-suse-distros.patch updated

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=211
This commit is contained in:
Charles Arnold 2014-12-01 15:27:05 +00:00 committed by Git OBS Bridge
parent bcb221b1bf
commit 412f00bae8
3 changed files with 12 additions and 5 deletions

View File

@ -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 <ledest@gmail.com>

View File

@ -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"

View File

@ -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