2017-01-18 19:49:48 +01:00
|
|
|
References: bsc#1010060
|
|
|
|
|
2017-08-09 21:02:00 +02:00
|
|
|
Index: virt-manager-1.4.2/virtinst/urlfetcher.py
|
2017-01-18 19:49:48 +01:00
|
|
|
===================================================================
|
2017-08-09 21:02:00 +02:00
|
|
|
--- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
|
|
|
|
+++ virt-manager-1.4.2/virtinst/urlfetcher.py
|
2017-08-22 16:08:14 +02:00
|
|
|
@@ -466,6 +466,10 @@ def _distroFromSUSEContent(fetcher, arch
|
2017-08-30 00:10:15 +02:00
|
|
|
dclass = OESDistro
|
2017-01-18 19:49:48 +01:00
|
|
|
if distro_version is None:
|
2017-08-30 00:10:15 +02:00
|
|
|
distro_version = _parse_sle_distribution(distribution)
|
2017-04-24 17:25:39 +02:00
|
|
|
+ elif re.match(".*SUSE Container as a Service Platform*", distribution[1]):
|
|
|
|
+ dclass = CAASPDistro
|
2017-01-18 19:49:48 +01:00
|
|
|
+ if distro_version is None:
|
|
|
|
+ distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[6]]
|
|
|
|
elif re.match(".*openSUSE.*", distribution[1]):
|
|
|
|
dclass = OpensuseDistro
|
|
|
|
if distro_version is None:
|
2017-08-30 00:10:15 +02:00
|
|
|
@@ -1052,6 +1056,8 @@ class SuseDistro(Distro):
|
|
|
|
self.os_variant += major_version + 'sp' + sp_version
|
|
|
|
else:
|
|
|
|
self.os_variant += major_version
|
|
|
|
+ elif self.os_variant.startswith("caasp"):
|
2017-04-24 17:25:39 +02:00
|
|
|
+ self.os_variant = "caasp"
|
2017-01-18 19:49:48 +01:00
|
|
|
else:
|
|
|
|
self.os_variant += "9"
|
|
|
|
|
2017-09-15 23:07:50 +02:00
|
|
|
@@ -1098,6 +1104,11 @@ class SLESDistro(SuseDistro):
|
|
|
|
class SLEDDistro(SuseDistro):
|
|
|
|
urldistro = "sled"
|
2017-01-18 19:49:48 +01:00
|
|
|
|
2017-09-15 23:07:50 +02:00
|
|
|
+
|
2017-04-24 17:25:39 +02:00
|
|
|
+class CAASPDistro(SuseDistro):
|
|
|
|
+ urldistro = "caasp"
|
2017-01-18 19:49:48 +01:00
|
|
|
+
|
2017-09-15 23:07:50 +02:00
|
|
|
+
|
|
|
|
class OESDistro(SuseDistro):
|
|
|
|
urldistro = "oes"
|
2017-01-18 19:49:48 +01:00
|
|
|
|