081f979e1e
Drop Requires on python3-six Refreshed several patches with minor line offset changes. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=467
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
References: bsc#1010060
|
|
|
|
Index: virt-manager-2.1.0/virtinst/urldetect.py
|
|
===================================================================
|
|
--- virt-manager-2.1.0.orig/virtinst/urldetect.py
|
|
+++ virt-manager-2.1.0/virtinst/urldetect.py
|
|
@@ -267,6 +267,12 @@ class _SUSEContent(object):
|
|
self.product_name.strip().rsplit(' ')[5][2])
|
|
distro_version = sle_version
|
|
|
|
+ # SUSE Container as a Service Platform
|
|
+ if "Container" in self.product_name:
|
|
+ distro_version = self.product_name.strip().rsplit(' ')[6]
|
|
+ elif "CaaS" in self.product_name:
|
|
+ distro_version = self.product_name.strip().rsplit(' ')[3]
|
|
+
|
|
return distro_version
|
|
|
|
|
|
@@ -553,6 +559,9 @@ class _SuseDistro(_RHELDistro):
|
|
# Tumbleweed 8 digit date
|
|
return "opensusetumbleweed"
|
|
|
|
+ if self._variant_prefix.startswith(("caasp")):
|
|
+ return self._variant_prefix + distro_version
|
|
+
|
|
if int(version) < 10:
|
|
return self._variant_prefix + "9"
|
|
|
|
@@ -625,6 +634,14 @@ class _OpensuseDistro(_SuseDistro):
|
|
famregex = ".*openSUSE.*"
|
|
|
|
|
|
+class _CAASPDistro(_SuseDistro):
|
|
+ PRETTY_NAME = "SLES"
|
|
+ matching_distros = ["caasp"]
|
|
+ _variant_prefix = "caasp"
|
|
+ _suse_regex = [".*SUSE Container as a Service Platform*", ".*SUSE CaaS Platform*"]
|
|
+ famregex = ".*(SUSE Container as a Service Platform|SUSE CaaS Platform).*"
|
|
+
|
|
+
|
|
class _OESDistro(_SuseDistro):
|
|
PRETTY_NAME = "OES"
|
|
matching_distros = ["oes"]
|