67142b1ff7
e902fa55-force-binary-mode-with-FTP-servers.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=358
47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
References: bsc#1010060
|
|
|
|
Index: virt-manager-1.4.2/virtinst/urlfetcher.py
|
|
===================================================================
|
|
--- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
|
|
+++ virt-manager-1.4.2/virtinst/urlfetcher.py
|
|
@@ -466,6 +466,10 @@ def _distroFromSUSEContent(fetcher, arch
|
|
dclass = SLESDistro
|
|
if distro_version is None:
|
|
distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]]
|
|
+ elif re.match(".*SUSE Container as a Service Platform*", distribution[1]):
|
|
+ dclass = CAASPDistro
|
|
+ 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:
|
|
@@ -1028,7 +1032,8 @@ class SuseDistro(Distro):
|
|
distro_version = self.version_from_content[1].strip()
|
|
version = distro_version.split('.', 1)[0].strip()
|
|
self.os_variant = self.urldistro
|
|
- if int(version) >= 10:
|
|
+ version_int = int(version)
|
|
+ if version_int >= 10:
|
|
if self.os_variant.startswith(("sles", "sled")):
|
|
sp_version = None
|
|
if len(distro_version.split('.', 1)) == 2:
|
|
@@ -1042,6 +1047,8 @@ class SuseDistro(Distro):
|
|
self.os_variant += "tumbleweed"
|
|
else:
|
|
self.os_variant += distro_version
|
|
+ elif version_int == 1 and self.os_variant.startswith("caasp"):
|
|
+ self.os_variant = "caasp"
|
|
else:
|
|
self.os_variant += "9"
|
|
|
|
@@ -1088,6 +1095,9 @@ class SLESDistro(SuseDistro):
|
|
class SLEDDistro(SuseDistro):
|
|
urldistro = "sled"
|
|
|
|
+class CAASPDistro(SuseDistro):
|
|
+ urldistro = "caasp"
|
|
+
|
|
|
|
# Suse image store is harder - we fetch the kernel RPM and a helper
|
|
# RPM and then munge bits together to generate a initrd
|