pool/virt-manager
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bsc#1179236 - L3: virt-install: "Error validating install

Browse Source 
location: invalid literal for int() with base 10" reported by
  virt-install ref:_00D1igLOd._5001iTe00n:ref
  virtinst-sap-detection.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=529
This commit is contained in:
Charles Arnold 2020-11-30 22:06:09 +00:00 committed by Git OBS Bridge
parent 552f64b200
commit b5bcf7ffeb
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
virt-manager.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Nov 30 13:39:10 MST 2020 - carnold@suse.com
- bsc#1179236 - L3: virt-install: "Error validating install
location: invalid literal for int() with base 10" reported by
virt-install ref:_00D1igLOd._5001iTe00n:ref
virtinst-sap-detection.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 25 19:00:46 UTC 2020 - Bruce Rogers <brogers@suse.com> Wed Nov 25 19:00:46 UTC 2020 - Bruce Rogers <brogers@suse.com>

2
virt-manager.spec
View File

@ -72,6 +72,7 @@ Patch174: virtinst-use-qemu-for-cdrom-device.patch
Patch175: virtinst-keep-install-iso-attached.patch Patch175: virtinst-keep-install-iso-attached.patch
Patch176: virtinst-dont-use-special-copy-cpu-features.patch Patch176: virtinst-dont-use-special-copy-cpu-features.patch
Patch177: virtinst-set-default-nic.patch Patch177: virtinst-set-default-nic.patch
Patch178: virtinst-sap-detection.patch
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -196,6 +197,7 @@ machine).
%patch175 -p1 %patch175 -p1
%patch176 -p1 %patch176 -p1
%patch177 -p1 %patch177 -p1
%patch178 -p1
%build %build
%if %{default_hvs} %if %{default_hvs}

23
virtinst-sap-detection.patch Normal file
View File

@ -0,0 +1,23 @@
Index: virt-manager-3.2.0/virtinst/install/urldetect.py
===================================================================
--- virt-manager-3.2.0.orig/virtinst/install/urldetect.py
+++ virt-manager-3.2.0/virtinst/install/urldetect.py
@@ -271,9 +271,16 @@ class _SUSEContent(object):
distro_version = distro_version.strip()
if "Enterprise" in self.product_name or "SLES" in self.product_name:
- sle_version = self.product_name.strip().rsplit(' ')[4]
+ if " SAP " in self.product_name:
+ sle_version = self.product_name.strip().rsplit(' ')[7]
+ else:
+ sle_version = self.product_name.strip().rsplit(' ')[4]
if len(self.product_name.strip().rsplit(' ')) > 5:
- sle_version = (sle_version + '.' +
+ if " SAP " in self.product_name:
+ sle_version = (sle_version + '.' +
+ self.product_name.strip().rsplit(' ')[8][2])
+ else:
+ sle_version = (sle_version + '.' +
self.product_name.strip().rsplit(' ')[5][2])
distro_version = sle_version