From b5bcf7ffeb45edcd2e293d27bff432eabfb654bc Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Mon, 30 Nov 2020 22:06:09 +0000 Subject: [PATCH] - 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 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=529 --- virt-manager.changes | 8 ++++++++ virt-manager.spec | 2 ++ virtinst-sap-detection.patch | 23 +++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 virtinst-sap-detection.patch diff --git a/virt-manager.changes b/virt-manager.changes index 8b9f5c2b..05a2d649 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -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 diff --git a/virt-manager.spec b/virt-manager.spec index 8de1c9bf..31944f98 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -72,6 +72,7 @@ Patch174: virtinst-use-qemu-for-cdrom-device.patch Patch175: virtinst-keep-install-iso-attached.patch Patch176: virtinst-dont-use-special-copy-cpu-features.patch Patch177: virtinst-set-default-nic.patch +Patch178: virtinst-sap-detection.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -196,6 +197,7 @@ machine). %patch175 -p1 %patch176 -p1 %patch177 -p1 +%patch178 -p1 %build %if %{default_hvs} diff --git a/virtinst-sap-detection.patch b/virtinst-sap-detection.patch new file mode 100644 index 00000000..ceba3eda --- /dev/null +++ b/virtinst-sap-detection.patch @@ -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 +