Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2018-06-22 13:35:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-manager (Old) and /work/SRC/openSUSE:Factory/.virt-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-manager" Fri Jun 22 13:35:06 2018 rev:180 rq:618146 version:1.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2018-06-02 12:14:10.539528193 +0200 +++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes 2018-06-22 13:35:18.598813008 +0200 @@ -1,0 +2,14 @@ +Wed Jun 20 11:04:14 MDT 2018 - [email protected] + +- bsc#1096819 - virt-install - Couldn't find hvm kernel for SUSE + tree + virtinst-python2-to-python3-conversion.patch + +------------------------------------------------------------------- +Tue Jun 19 11:22:52 MDT 2018 - [email protected] + +- bsc#1098054 - osinfo-query and virt-install do not detect + caasp3.0 + virtinst-add-caasp-support.patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtinst-add-caasp-support.patch ++++++ --- /var/tmp/diff_new_pack.IsdOAi/_old 2018-06-22 13:35:24.754585449 +0200 +++ /var/tmp/diff_new_pack.IsdOAi/_new 2018-06-22 13:35:24.754585449 +0200 @@ -1,21 +1,23 @@ References: bsc#1010060 -Index: virt-manager-1.5.0/virtinst/urlfetcher.py +Index: virt-manager-1.5.1/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/urlfetcher.py -+++ virt-manager-1.5.0/virtinst/urlfetcher.py -@@ -490,6 +490,10 @@ def _distroFromSUSEContent(fetcher, arch +--- virt-manager-1.5.1.orig/virtinst/urlfetcher.py ++++ virt-manager-1.5.1/virtinst/urlfetcher.py +@@ -490,6 +490,12 @@ def _distroFromSUSEContent(fetcher, arch dclass = OESDistro if distro_version is None: distro_version = _parse_sle_distribution(distribution) -+ elif re.match(".*SUSE Container as a Service Platform*", distribution[1]): ++ elif re.match(".*SUSE Container as a Service Platform*", distribution[1]) or \ ++ re.match(".*SUSE CaaS Platform*", distribution[1]): + dclass = CAASPDistro + if distro_version is None: -+ distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[6]] ++ dparts = distribution[1].strip().rsplit(' ') ++ distro_version = ['VERSION', dparts[len(dparts)-1]] elif re.match(".*openSUSE.*", distribution[1]): dclass = OpensuseDistro if distro_version is None: -@@ -1076,6 +1080,8 @@ class SuseDistro(Distro): +@@ -1076,6 +1082,8 @@ class SuseDistro(Distro): self.os_variant += major_version + 'sp' + sp_version else: self.os_variant += major_version @@ -24,7 +26,7 @@ else: self.os_variant += "9" -@@ -1122,6 +1128,11 @@ class SLESDistro(SuseDistro): +@@ -1122,6 +1130,11 @@ class SLESDistro(SuseDistro): class SLEDDistro(SuseDistro): urldistro = "sled" ++++++ virtinst-add-sle15-detection-support.patch ++++++ --- /var/tmp/diff_new_pack.IsdOAi/_old 2018-06-22 13:35:24.766585006 +0200 +++ /var/tmp/diff_new_pack.IsdOAi/_new 2018-06-22 13:35:24.766585006 +0200 @@ -6,10 +6,10 @@ As a fallback, detection is also setup to look at the media.1/products and media.1/build files. -Index: virt-manager-1.5.0/virtinst/urlfetcher.py +Index: virt-manager-1.5.1/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/urlfetcher.py -+++ virt-manager-1.5.0/virtinst/urlfetcher.py +--- virt-manager-1.5.1.orig/virtinst/urlfetcher.py ++++ virt-manager-1.5.1/virtinst/urlfetcher.py @@ -416,7 +416,23 @@ def _distroFromSUSEContent(fetcher, arch try: cbuf = fetcher.acquireFileContent("content") @@ -44,10 +44,10 @@ dclass = SLESDistro if distro_version is None: distro_version = _parse_sle_distribution(distribution) -@@ -505,10 +521,13 @@ def _distroFromSUSEContent(fetcher, arch - dclass = CAASPDistro +@@ -507,10 +523,13 @@ def _distroFromSUSEContent(fetcher, arch if distro_version is None: - distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[6]] + dparts = distribution[1].strip().rsplit(' ') + distro_version = ['VERSION', dparts[len(dparts)-1]] - elif re.match(".*openSUSE.*", distribution[1]): + elif re.match(".*openSUSE.*", distribution[1]) or re.match("openSUSE *", distribution[1]): dclass = OpensuseDistro @@ -60,7 +60,7 @@ if distro_version is None: return None -@@ -1027,6 +1046,7 @@ class SLDistro(RHELDistro): +@@ -1029,6 +1048,7 @@ class SLDistro(RHELDistro): class SuseDistro(Distro): name = "SUSE" @@ -68,7 +68,7 @@ _boot_iso_paths = ["boot/boot.iso"] -@@ -1064,8 +1084,11 @@ class SuseDistro(Distro): +@@ -1066,8 +1086,11 @@ class SuseDistro(Distro): self._xen_kernel_paths = [("boot/%s/vmlinuz-xenpae" % self.arch, "boot/%s/initrd-xenpae" % self.arch)] else: @@ -82,7 +82,7 @@ def _variantFromVersion(self): distro_version = self.version_from_content[1].strip() -@@ -1077,7 +1100,7 @@ class SuseDistro(Distro): +@@ -1079,7 +1102,7 @@ class SuseDistro(Distro): if len(distro_version.split('.', 1)) == 2: sp_version = 'sp' + distro_version.split('.', 1)[1].strip() self.os_variant += version @@ -91,7 +91,7 @@ self.os_variant += sp_version elif self.os_variant.startswith("opensuse"): if len(version) == 8: -@@ -1101,6 +1124,24 @@ class SuseDistro(Distro): +@@ -1103,6 +1126,24 @@ class SuseDistro(Distro): self.os_variant += "9" def isValidStore(self): @@ -116,7 +116,7 @@ # self.version_from_content is the VERSION line from the contents file if (not self.version_from_content or self.version_from_content[1] is None): -@@ -1152,8 +1193,6 @@ class OESDistro(SuseDistro): +@@ -1154,8 +1195,6 @@ class OESDistro(SuseDistro): urldistro = "oes" ++++++ virtinst-handle-tumbleweed-treeinfo-file.patch ++++++ --- /var/tmp/diff_new_pack.IsdOAi/_old 2018-06-22 13:35:24.786584266 +0200 +++ /var/tmp/diff_new_pack.IsdOAi/_new 2018-06-22 13:35:24.790584118 +0200 @@ -1,11 +1,11 @@ References: bsc#1091113 In Tumbleweed the .treeinfo file has no version as it is mostly meaningless. -Index: virt-manager-1.5.0/virtinst/urlfetcher.py +Index: virt-manager-1.5.1/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/urlfetcher.py -+++ virt-manager-1.5.0/virtinst/urlfetcher.py -@@ -1136,7 +1136,10 @@ class SuseDistro(Distro): +--- virt-manager-1.5.1.orig/virtinst/urlfetcher.py ++++ virt-manager-1.5.1/virtinst/urlfetcher.py +@@ -1138,7 +1138,10 @@ class SuseDistro(Distro): "Open Enterprise" in family and 'oes' in self.urldistro: ret = True if ret: ++++++ virtinst-python2-to-python3-conversion.patch ++++++ --- /var/tmp/diff_new_pack.IsdOAi/_old 2018-06-22 13:35:24.810583379 +0200 +++ /var/tmp/diff_new_pack.IsdOAi/_new 2018-06-22 13:35:24.810583379 +0200 @@ -458,7 +458,15 @@ size = os.path.getsize(url) return urlobj, size -@@ -395,14 +399,14 @@ def _grabTreeinfo(fetcher): +@@ -358,6 +362,7 @@ class _ISOURLFetcher(_URLFetcher): + + logging.debug("Running isoinfo: %s", cmd) + output = subprocess.check_output(cmd) ++ output = output.decode() + + self._cache_file_list = output.splitlines(False) + +@@ -395,14 +400,14 @@ def _grabTreeinfo(fetcher): return None try: @@ -475,7 +483,7 @@ logging.debug("Did not find 'family' section in treeinfo") return None -@@ -415,11 +419,13 @@ def _distroFromSUSEContent(fetcher, arch +@@ -415,11 +420,13 @@ def _distroFromSUSEContent(fetcher, arch # None if no content, GenericDistro if unknown label type. try: cbuf = fetcher.acquireFileContent("content") @@ -489,7 +497,7 @@ pbuf = pbuf.split(' ', 1)[1].strip() # The media.1/products file naming convention changed between SLE11 and SLE12 if pbuf.startswith('SLE'): -@@ -428,6 +434,7 @@ def _distroFromSUSEContent(fetcher, arch +@@ -428,6 +435,7 @@ def _distroFromSUSEContent(fetcher, arch cbuf = "\nDISTRO ," + pbuf.replace('-', ' ') try: bbuf = fetcher.acquireFileContent("media.1/build").split('-') @@ -497,7 +505,7 @@ except: bbuf = ["x86_64"] cbuf = cbuf + "\n" + " ".join(bbuf) -@@ -645,7 +652,7 @@ class Distro(object): +@@ -647,7 +655,7 @@ class Distro(object): try: kernelpath = self._getTreeinfoMedia("kernel") initrdpath = self._getTreeinfoMedia("initrd") @@ -506,7 +514,7 @@ pass if not kernelpath or not initrdpath: -@@ -712,6 +719,7 @@ class Distro(object): +@@ -714,6 +722,7 @@ class Distro(object): # Fetch 'filename' and return True/False if it matches the regex try: content = self.fetcher.acquireFileContent(filename) @@ -514,7 +522,7 @@ except ValueError: return False -@@ -781,15 +789,15 @@ class GenericDistro(Distro): +@@ -783,15 +792,15 @@ class GenericDistro(Distro): self._valid_kernel_path = ( self._getTreeinfoMedia("kernel"), self._getTreeinfoMedia("initrd")) @@ -533,7 +541,7 @@ logging.debug(e) if self.type == "xen": -@@ -1475,7 +1483,7 @@ class ALTLinuxDistro(Distro): +@@ -1477,7 +1486,7 @@ class ALTLinuxDistro(Distro): # Build list of all *Distro classes def _build_distro_list(): allstores = [] ++++++ virtinst-use-xenpae-kernel-for-32bit.patch ++++++ --- /var/tmp/diff_new_pack.IsdOAi/_old 2018-06-22 13:35:24.838582344 +0200 +++ /var/tmp/diff_new_pack.IsdOAi/_new 2018-06-22 13:35:24.838582344 +0200 @@ -4,11 +4,11 @@ virtualized if the pae kernel is selected. Note that sles12 and newer has no 32bit release. -Index: virt-manager-1.5.0/virtinst/urlfetcher.py +Index: virt-manager-1.5.1/virtinst/urlfetcher.py =================================================================== ---- virt-manager-1.5.0.orig/virtinst/urlfetcher.py -+++ virt-manager-1.5.0/virtinst/urlfetcher.py -@@ -1049,8 +1049,12 @@ class SuseDistro(Distro): +--- virt-manager-1.5.1.orig/virtinst/urlfetcher.py ++++ virt-manager-1.5.1/virtinst/urlfetcher.py +@@ -1051,8 +1051,12 @@ class SuseDistro(Distro): "boot/%s/initrd" % self.arch)) # Matches Opensuse > 10.2 and sles 10
