39879bbe9c
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
33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
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"
|
|
|