- bsc#964407 - Virt-Manager: Installer wrongly detects SLE-12-GA

media as SLE-12-SP1
  virtinst-fix-sle12sp1-detection.patch
- Fix Tumbleweed detection
  virtinst-fix-tumbleweed-detection.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=298

virt-manager.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Feb  2 14:08:43 MST 2016 - carnold@suse.com
+
+- bsc#964407 - Virt-Manager: Installer wrongly detects SLE-12-GA
+  media as SLE-12-SP1
+  virtinst-fix-sle12sp1-detection.patch
+- Fix Tumbleweed detection
+  virtinst-fix-tumbleweed-detection.patch
+
 -------------------------------------------------------------------
 Fri Jan 29 16:44:17 UTC 2016 - jfehlig@suse.com
 

virt-manager.spec

@@ -76,6 +76,8 @@ Patch160:       virtinst-xen-drive-type.patch
 Patch161:       virtinst-xenbus-disk-index-fix.patch
 Patch162:       virtinst-refresh_before_fetch_pool.patch
 Patch163:       virtinst-replace-unar-with-other-archivers.patch
+Patch164:       virtinst-fix-sle12sp1-detection.patch
+Patch165:       virtinst-fix-tumbleweed-detection.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -194,6 +196,8 @@ machine).
 %patch161 -p1
 %patch162 -p1
 %patch163 -p1
+%patch164 -p1
+%patch165 -p1
 
 %build
 %if %{qemu_user}

virtinst-fix-sle12sp1-detection.patch

@@ -0,0 +1,16 @@
+Index: virt-manager-1.3.2/virtinst/urlfetcher.py
+===================================================================
+--- virt-manager-1.3.2.orig/virtinst/urlfetcher.py
++++ virt-manager-1.3.2/virtinst/urlfetcher.py
+@@ -441,7 +441,10 @@ def _distroFromSUSEContent(fetcher, arch
+             re.match(".*SUSE SLES*", distribution[1]):
+             dclass = SLESDistro
+             if distro_version is None:
+-                distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]]
++                sles_version = distribution[1].strip().rsplit(' ')[4]
++                if len(distribution[1].strip().rsplit(' ')) > 5:
++                    sles_version = sles_version + '.' + distribution[1].strip().rsplit(' ')[5][2]
++                distro_version = ['VERSION', sles_version]
+         elif re.match(".*SUSE Linux Enterprise Desktop*", distribution[1]):
+             dclass = SLEDDistro
+             if distro_version is None:

virtinst-fix-tumbleweed-detection.patch

@@ -0,0 +1,32 @@
+References: bsc#964407
+Problem in the SUSE specific parsing code due to the non-standard way of
+defining the media in the SUSE content file.
+While we are here, also fix tumbleweed detection. You need an updated libosinfo
+that contains a definition for tumbleweed.
+Index: virt-manager-1.3.2/virtinst/urlfetcher.py
+===================================================================
+--- virt-manager-1.3.2.orig/virtinst/urlfetcher.py
++++ virt-manager-1.3.2/virtinst/urlfetcher.py
+@@ -457,9 +457,6 @@ def _distroFromSUSEContent(fetcher, arch
+             dclass = OpensuseDistro
+             if distro_version is None:
+                 distro_version = ['VERSION', distribution[0].strip().rsplit(':')[4]]
+-                # For tumbleweed we only have an 8 character date string so default to 13.2
+-                if distro_version[1] and len(distro_version[1]) == 8:
+-                    distro_version = ['VERSION', '13.2']
+ 
+     if distro_version is None:
+         return None
+@@ -1011,7 +1008,11 @@ class SuseDistro(Distro):
+                 if sp_version:
+                     self.os_variant += sp_version
+             else:
+-                self.os_variant += distro_version
++                # Tumbleweed 8 digit date
++                if len(version) == 8:
++                    self.os_variant += "-tumbleweed"
++                else:
++                    self.os_variant += distro_version
+         else:
+             self.os_variant += "9"
+ 

virtinst-replace-unar-with-other-archivers.patch

@@ -3,10 +3,10 @@ We don't ship unar with any suse distro (not even in Factory).
 Until we do, keep this patch to execute the correct archiver
 program.
 
-Index: virt-manager-1.3.0/virtconv/formats.py
+Index: virt-manager-1.3.2/virtconv/formats.py
 ===================================================================
---- virt-manager-1.3.0.orig/virtconv/formats.py
+--- virt-manager-1.3.2.orig/virtconv/formats.py
-+++ virt-manager-1.3.0/virtconv/formats.py
++++ virt-manager-1.3.2/virtconv/formats.py
 @@ -118,6 +118,8 @@ def _find_input(input_file, parser, prin
      try:
          ext = os.path.splitext(input_file)[1]