- bsc#1091113 - virt-install errs with: No option 'version' in

section: 'general
  virtinst-handle-tumbleweed-treeinfo-file.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=423
This commit is contained in:
Charles Arnold 2018-04-26 21:21:37 +00:00 committed by Git OBS Bridge
parent a51105234f
commit c4c286c0ef
4 changed files with 29 additions and 1 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Apr 26 15:00:36 MDT 2018 - carnold@suse.com
- bsc#1091113 - virt-install errs with: No option 'version' in
section: 'general
virtinst-handle-tumbleweed-treeinfo-file.patch
-------------------------------------------------------------------
Tue Apr 3 09:21:41 MDT 2018 - carnold@suse.com

View File

@ -87,6 +87,7 @@ Patch169: virtinst-keep-install-iso-attached.patch
Patch170: virtinst-osdict-get_supported.patch
Patch171: virtinst-dont-use-special-copy-cpu-features.patch
Patch172: virtinst-use-latest-opensuse-version-when-unknown-media.patch
Patch173: virtinst-handle-tumbleweed-treeinfo-file.patch
# Python2 to Python3 patches
Patch200: virtmisc-python2-to-python3-conversion.patch
Patch201: virtcli-python2-to-python3-conversion.patch
@ -231,6 +232,7 @@ machine).
%patch170 -p1
%patch171 -p1
%patch172 -p1
%patch173 -p1
# Python2 to Python3 patches
%patch200 -p1
%patch201 -p1

View File

@ -0,0 +1,19 @@
References: bsc#1091113
In Tumbleweed the .treeinfo file has no version as it is mostly meaningless.
Index: virt-manager-1.5.0/virtinst/urlfetcher.py
===================================================================
--- virt-manager-1.5.0.orig/virtinst/urlfetcher.py
+++ virt-manager-1.5.0/virtinst/urlfetcher.py
@@ -1136,7 +1136,10 @@ class SuseDistro(Distro):
"Open Enterprise" in family and 'oes' in self.urldistro:
ret = True
if ret:
- version = self.treeinfo.get("general", "version")
+ if 'Tumbleweed' not in family:
+ version = self.treeinfo.get("general", "version")
+ else:
+ version = "tmblweed"
distro_version = ['VERSION', version]
self.version_from_content = distro_version
self._variantFromVersion()

View File

@ -533,7 +533,7 @@ Index: virt-manager-1.5.0/virtinst/urlfetcher.py
logging.debug(e)
if self.type == "xen":
@@ -1472,7 +1480,7 @@ class ALTLinuxDistro(Distro):
@@ -1475,7 +1483,7 @@ class ALTLinuxDistro(Distro):
# Build list of all *Distro classes
def _build_distro_list():
allstores = []