Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2016-02-08 09:47:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-manager (Old) and /work/SRC/openSUSE:Factory/.virt-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2016-02-03 10:19:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes 2016-02-08 09:47:37.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Feb 2 14:08:43 MST 2016 - [email protected] + +- bsc#964407 - Virt-Manager: Installer wrongly detects SLE-12-GA + media as SLE-12-SP1 + virtinst-fix-sle12sp1-detection.patch +- Fix Tumbleweed detection + virtinst-fix-tumbleweed-detection.patch + +------------------------------------------------------------------- New: ---- virtinst-fix-sle12sp1-detection.patch virtinst-fix-tumbleweed-detection.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.UtmOx4/_old 2016-02-08 09:47:38.000000000 +0100 +++ /var/tmp/diff_new_pack.UtmOx4/_new 2016-02-08 09:47:38.000000000 +0100 @@ -76,6 +76,8 @@ Patch161: virtinst-xenbus-disk-index-fix.patch Patch162: virtinst-refresh_before_fetch_pool.patch Patch163: virtinst-replace-unar-with-other-archivers.patch +Patch164: virtinst-fix-sle12sp1-detection.patch +Patch165: virtinst-fix-tumbleweed-detection.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -194,6 +196,8 @@ %patch161 -p1 %patch162 -p1 %patch163 -p1 +%patch164 -p1 +%patch165 -p1 %build %if %{qemu_user} ++++++ virtinst-fix-sle12sp1-detection.patch ++++++ Index: virt-manager-1.3.2/virtinst/urlfetcher.py =================================================================== --- virt-manager-1.3.2.orig/virtinst/urlfetcher.py +++ virt-manager-1.3.2/virtinst/urlfetcher.py @@ -441,7 +441,10 @@ def _distroFromSUSEContent(fetcher, arch re.match(".*SUSE SLES*", distribution[1]): dclass = SLESDistro if distro_version is None: - distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]] + sles_version = distribution[1].strip().rsplit(' ')[4] + if len(distribution[1].strip().rsplit(' ')) > 5: + sles_version = sles_version + '.' + distribution[1].strip().rsplit(' ')[5][2] + distro_version = ['VERSION', sles_version] elif re.match(".*SUSE Linux Enterprise Desktop*", distribution[1]): dclass = SLEDDistro if distro_version is None: ++++++ virtinst-fix-tumbleweed-detection.patch ++++++ References: bsc#964407 Problem in the SUSE specific parsing code due to the non-standard way of defining the media in the SUSE content file. While we are here, also fix tumbleweed detection. You need an updated libosinfo that contains a definition for tumbleweed. Index: virt-manager-1.3.2/virtinst/urlfetcher.py =================================================================== --- virt-manager-1.3.2.orig/virtinst/urlfetcher.py +++ virt-manager-1.3.2/virtinst/urlfetcher.py @@ -457,9 +457,6 @@ def _distroFromSUSEContent(fetcher, arch dclass = OpensuseDistro if distro_version is None: distro_version = ['VERSION', distribution[0].strip().rsplit(':')[4]] - # For tumbleweed we only have an 8 character date string so default to 13.2 - if distro_version[1] and len(distro_version[1]) == 8: - distro_version = ['VERSION', '13.2'] if distro_version is None: return None @@ -1011,7 +1008,11 @@ class SuseDistro(Distro): if sp_version: self.os_variant += sp_version else: - self.os_variant += distro_version + # Tumbleweed 8 digit date + if len(version) == 8: + self.os_variant += "-tumbleweed" + else: + self.os_variant += distro_version else: self.os_variant += "9" ++++++ virtinst-replace-unar-with-other-archivers.patch ++++++ --- /var/tmp/diff_new_pack.UtmOx4/_old 2016-02-08 09:47:38.000000000 +0100 +++ /var/tmp/diff_new_pack.UtmOx4/_new 2016-02-08 09:47:38.000000000 +0100 @@ -3,10 +3,10 @@ Until we do, keep this patch to execute the correct archiver program. -Index: virt-manager-1.3.0/virtconv/formats.py +Index: virt-manager-1.3.2/virtconv/formats.py =================================================================== ---- virt-manager-1.3.0.orig/virtconv/formats.py -+++ virt-manager-1.3.0/virtconv/formats.py +--- virt-manager-1.3.2.orig/virtconv/formats.py ++++ virt-manager-1.3.2/virtconv/formats.py @@ -118,6 +118,8 @@ def _find_input(input_file, parser, prin try: ext = os.path.splitext(input_file)[1]
