diff --git a/virt-manager.changes b/virt-manager.changes index e37fb18f..51663c27 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 24 16:55:36 JST 2017 - jan.hilberath@suse.com + +- Fix CaaSP detection (bsc#1010060) + Allow installation of "SUSE Container as a Service Platform". + virtinst-add-caasp-support.patch + ------------------------------------------------------------------- Wed Mar 15 22:24:27 MDT 2017 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index e03b2785..fb924871 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -61,7 +61,7 @@ Patch125: virtinst-set-cache-mode-unsafe-for-install.patch Patch126: virtinst-set-qemu-emulator.patch Patch127: virtinst-add-ppc64-arch-support.patch Patch128: virtinst-s390x-disable-graphics.patch -Patch129: virtinst-add-casp-support.patch +Patch129: virtinst-add-caasp-support.patch Patch130: virtinst-expand-combobox.patch # Bug Fixes Patch150: virtman-prevent-double-click-starting-vm-twice.patch diff --git a/virtinst-add-casp-support.patch b/virtinst-add-caasp-support.patch similarity index 83% rename from virtinst-add-casp-support.patch rename to virtinst-add-caasp-support.patch index 7fb6820a..cbf7a163 100644 --- a/virtinst-add-casp-support.patch +++ b/virtinst-add-caasp-support.patch @@ -1,6 +1,4 @@ References: bsc#1010060 -Notes: SUSE Containers as a Service Platform and 'CASP' are not -names set in stone yet and could change before the product ships. Index: virt-manager-1.4.1/virtinst/urlfetcher.py =================================================================== @@ -10,8 +8,8 @@ Index: virt-manager-1.4.1/virtinst/urlfetcher.py dclass = SLESDistro if distro_version is None: distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]] -+ elif re.match(".*SUSE Containers as a Service Platform*", distribution[1]): -+ dclass = CASPDistro ++ 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]): @@ -31,8 +29,8 @@ Index: virt-manager-1.4.1/virtinst/urlfetcher.py self.os_variant += "tumbleweed" else: self.os_variant += distro_version -+ elif version_int == 1 and self.os_variant.startswith("casp"): -+ self.os_variant = "casp" ++ elif version_int == 1 and self.os_variant.startswith("caasp"): ++ self.os_variant = "caasp" else: self.os_variant += "9" @@ -40,8 +38,8 @@ Index: virt-manager-1.4.1/virtinst/urlfetcher.py class SLEDDistro(SuseDistro): urldistro = "sled" -+class CASPDistro(SuseDistro): -+ urldistro = "casp" ++class CAASPDistro(SuseDistro): ++ urldistro = "caasp" + # Suse image store is harder - we fetch the kernel RPM and a helper