Hello community,

here is the log from the commit of package virt-manager for openSUSE:Factory 
checked in at 2018-02-09 15:46:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virt-manager (Old)
 and      /work/SRC/openSUSE:Factory/.virt-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "virt-manager"

Fri Feb  9 15:46:19 2018 rev:171 rq:573846 version:1.5.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes        
2018-01-25 12:41:22.460328085 +0100
+++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes   
2018-02-09 15:46:19.854009285 +0100
@@ -1,0 +2,82 @@
+Wed Feb  7 08:58:09 MST 2018 - carn...@suse.com
+
+- Update to virt-manager 1.5.0 (bsc#1027942)
+  virt-manager-1.5.0.tar.bz2
+  * python3 prep work (Radostin Stoyanov, Cole Robinson, Cédric Bosdonnat)
+  * Switch –location ISO to use isoinfo (Andrew Wong)
+  * virt-install: add –cpu numa distance handling (Menno Lageman)
+  * virt-install: fix –disk for rbd volumes with auth (Rauno Väli)
+  * virt-install: add –cputune vcpupin handling (Wim ten Have)
+  * details ui: Showing attached scsi devices per controller (Lin Ma)
+  * network ui: Show details about SR-IOV VF pool (Lin Ma)
+  * Greatly expand UI test suite coverage
+- Dropped patches
+  0001-Improve-container-image-url-example.patch
+  0001-py3-store-exception-variables-for-use-outside-except.patch
+  0002-create-wizard-fix-alignment-in-os-container-page.patch
+  0003-oscontainer-ask-root-password-in-the-wizard.patch
+  0004-Harmonize-invisible_char-values.patch
+  083dfcc8-Show-details-about-the-network-of-SR-IOV-VF-pool.patch
+  08a58d61-pycodestyle-remove-description-of-fixed-errors.patch
+  0c6bcb09-fix-bytes-string-mess-in-serial-console.patch
+  0e812e3c-dont-skip-authentication-for-listen-type-none-with-fixed-QEMU.patch
+  23aaf852-network-Set-bridge-name-to-None-instead-of-blank.patch
+  2d276ebe-progress-dont-overwrite-format.patch
+  2eb455c9-correctly-calculate-virtio-scsi-controller-index.patch
+  374a3779-urlfetcher-write-test-file-as-binary-content.patch
+  37ea5207-replace-StandardError-with-Exception.patch
+  3b769643-dont-add-URI-into-params-for-tunneled-migration.patch
+  3be78d1f-addhardware-dont-allow-panic-option-where-not-supported.patch
+  44de92b7-use-reload-from-imp-module.patch
+  63fce081-pycodestyle-Use-isinstance-for-type-checking.patch
+  67122615-python2to3-division-compatability.patch
+  69c84bea-import-reduce-from-functools-module.patch
+  6dfc4de1-add-support-for-parsing-formatting-SR-IOV-VFs.patch
+  
6e6f59e7-diskbackend-get-a-proper-size-of-existing-block-device-while-cloning.patch
+  73de8285-systray-remove-redundant-variable-assignment.patch
+  75210ed3-replace-StringIO-with-io.patch
+  7f1b4cee-pycodestyle-fix-all-E125-warnings.patch
+  7fc7e94f-fix-virtio-scsi-controller-target-calculation.patch
+  91c0669c-cli-Fix-OrderedDict-mutated-during-iteration-on-python3.patch
+  9617d126-systray-Use-APPLICATION_STATUS-for-appindicator.patch
+  999dbb36-cli-Make-VirtCLIArgument-instantiation-less-crazy.patch
+  9a9f9ecd-ignore-comments-in-keymap-conf-files.patch
+  a2bcd6c4-dont-compare-between-None-and-int.patch
+  b5b2433a-baseclass-Fix-UI-file-loading-on-py3.patch
+  b8fa0c6b-xmlnsqemu-order-XML-output-like-libvirt-does.patch
+  b9bc3b60-undefine-only-persistent-domain.patch
+  bc3c9a9d-progress-remove-unused-import.patch
+  bc8c5b07-append--attach-to-virt-viewer-if-graphics-has-listen-type-none.patch
+  c174b550-connection-Another-py3-exception-variable-fix.patch
+  d1e1cf64-progress-remove-trailing-white-space.patch
+  d2648d81-virtconv-dont-implicitly-depend-on-dict-hash-order.patch
+  d82022bd-manager-drop-python2-only-cmp-usage.patch
+  dff00d4f-remove-deprecated-statvfs-module.patch
+  e2ad4b2f-convert-iteritems-to-items.patch
+  e73abe5a-diskbackend-convert-to-long-the-calculated-size.patch
+  f41aafc7-Use-enumerate-instead-of-range-and-len.patch
+  f7c8cf9f-devicepanic-dont-return-empty-model-list.patch
+  f836e47b-virtinst-Fix-URLFetcher-for-reading-files.patch
+
+-------------------------------------------------------------------
+Tue Feb  6 11:57:54 MST 2018 - carn...@suse.com
+
+- Upstream bug fixes (bsc#1027942)
+  b5b2433a-baseclass-Fix-UI-file-loading-on-py3.patch
+  0c6bcb09-fix-bytes-string-mess-in-serial-console.patch
+  bc8c5b07-append--attach-to-virt-viewer-if-graphics-has-listen-type-none.patch
+  0e812e3c-dont-skip-authentication-for-listen-type-none-with-fixed-QEMU.patch
+  67122615-python2to3-division-compatability.patch
+- Dropped in favor of upstream version
+  0001-virtinst-python3-terminal-width-should-be-int.patch
+  python3-fix-bytes-string-mess-in-serial-console.patch
+
+-------------------------------------------------------------------
+Mon Feb  5 16:26:48 MST 2018 - carn...@suse.com
+
+- Default to sles15 and opensuse15 as the 'preferred_distros' for
+  this release. (bsc#1054986)
+  virtinst-osdict-get_supported.patch
+  virt-manager.spec
+
+-------------------------------------------------------------------
@@ -4,0 +87 @@
+  (bsc#1070896)

Old:
----
  0001-Improve-container-image-url-example.patch
  0001-py3-store-exception-variables-for-use-outside-except.patch
  0001-virtinst-python3-terminal-width-should-be-int.patch
  0002-create-wizard-fix-alignment-in-os-container-page.patch
  0003-oscontainer-ask-root-password-in-the-wizard.patch
  0004-Harmonize-invisible_char-values.patch
  083dfcc8-Show-details-about-the-network-of-SR-IOV-VF-pool.patch
  08a58d61-pycodestyle-remove-description-of-fixed-errors.patch
  23aaf852-network-Set-bridge-name-to-None-instead-of-blank.patch
  2d276ebe-progress-dont-overwrite-format.patch
  2eb455c9-correctly-calculate-virtio-scsi-controller-index.patch
  374a3779-urlfetcher-write-test-file-as-binary-content.patch
  37ea5207-replace-StandardError-with-Exception.patch
  3b769643-dont-add-URI-into-params-for-tunneled-migration.patch
  3be78d1f-addhardware-dont-allow-panic-option-where-not-supported.patch
  44de92b7-use-reload-from-imp-module.patch
  63fce081-pycodestyle-Use-isinstance-for-type-checking.patch
  69c84bea-import-reduce-from-functools-module.patch
  6dfc4de1-add-support-for-parsing-formatting-SR-IOV-VFs.patch
  
6e6f59e7-diskbackend-get-a-proper-size-of-existing-block-device-while-cloning.patch
  73de8285-systray-remove-redundant-variable-assignment.patch
  75210ed3-replace-StringIO-with-io.patch
  7f1b4cee-pycodestyle-fix-all-E125-warnings.patch
  7fc7e94f-fix-virtio-scsi-controller-target-calculation.patch
  91c0669c-cli-Fix-OrderedDict-mutated-during-iteration-on-python3.patch
  9617d126-systray-Use-APPLICATION_STATUS-for-appindicator.patch
  999dbb36-cli-Make-VirtCLIArgument-instantiation-less-crazy.patch
  9a9f9ecd-ignore-comments-in-keymap-conf-files.patch
  a2bcd6c4-dont-compare-between-None-and-int.patch
  b8fa0c6b-xmlnsqemu-order-XML-output-like-libvirt-does.patch
  b9bc3b60-undefine-only-persistent-domain.patch
  bc3c9a9d-progress-remove-unused-import.patch
  c174b550-connection-Another-py3-exception-variable-fix.patch
  d1e1cf64-progress-remove-trailing-white-space.patch
  d2648d81-virtconv-dont-implicitly-depend-on-dict-hash-order.patch
  d82022bd-manager-drop-python2-only-cmp-usage.patch
  dff00d4f-remove-deprecated-statvfs-module.patch
  e2ad4b2f-convert-iteritems-to-items.patch
  e73abe5a-diskbackend-convert-to-long-the-calculated-size.patch
  f41aafc7-Use-enumerate-instead-of-range-and-len.patch
  f7c8cf9f-devicepanic-dont-return-empty-model-list.patch
  f836e47b-virtinst-Fix-URLFetcher-for-reading-files.patch
  python3-fix-bytes-string-mess-in-serial-console.patch
  virt-manager-1.4.3.tar.bz2

New:
----
  virt-manager-1.5.0.tar.bz2
  virtinst-osdict-get_supported.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ virt-manager.spec ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:21.957933736 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:21.961933593 +0100
@@ -21,13 +21,13 @@
 %define qemu_user          "qemu"
 %define libvirt_kvm_packages   ""
 %define libvirt_xen_packages   ""
-%define preferred_distros  "sles12sp3,opensuse42.3"
+%define preferred_distros  "sles15,opensuse15"
 %define kvm_packages       ""
-%define _version           1.4.3
+%define _version           1.5.0
 %define _release           0
 
 Name:           virt-manager
-Version:        1.4.3
+Version:        1.5.0
 Release:        0
 Summary:        Virtual Machine Manager
 License:        GPL-2.0+
@@ -38,42 +38,6 @@
 Source2:        virt-install.desktop
 Source3:        virt-manager-supportconfig
 # Upstream Patches
-Patch1:         3b769643-dont-add-URI-into-params-for-tunneled-migration.patch
-Patch2:         6dfc4de1-add-support-for-parsing-formatting-SR-IOV-VFs.patch
-Patch3:         083dfcc8-Show-details-about-the-network-of-SR-IOV-VF-pool.patch
-Patch4:         9a9f9ecd-ignore-comments-in-keymap-conf-files.patch
-Patch5:         9617d126-systray-Use-APPLICATION_STATUS-for-appindicator.patch
-Patch6:         e73abe5a-diskbackend-convert-to-long-the-calculated-size.patch
-Patch7:         
6e6f59e7-diskbackend-get-a-proper-size-of-existing-block-device-while-cloning.patch
-Patch8:         23aaf852-network-Set-bridge-name-to-None-instead-of-blank.patch
-Patch9:         d1e1cf64-progress-remove-trailing-white-space.patch
-Patch10:        63fce081-pycodestyle-Use-isinstance-for-type-checking.patch
-Patch11:        08a58d61-pycodestyle-remove-description-of-fixed-errors.patch
-Patch12:        bc3c9a9d-progress-remove-unused-import.patch
-Patch13:        2d276ebe-progress-dont-overwrite-format.patch
-Patch14:        e2ad4b2f-convert-iteritems-to-items.patch
-Patch15:        dff00d4f-remove-deprecated-statvfs-module.patch
-Patch16:        75210ed3-replace-StringIO-with-io.patch
-Patch17:        a2bcd6c4-dont-compare-between-None-and-int.patch
-Patch18:        44de92b7-use-reload-from-imp-module.patch
-Patch19:        69c84bea-import-reduce-from-functools-module.patch
-Patch20:        37ea5207-replace-StandardError-with-Exception.patch
-Patch21:        f41aafc7-Use-enumerate-instead-of-range-and-len.patch
-Patch22:        
91c0669c-cli-Fix-OrderedDict-mutated-during-iteration-on-python3.patch
-Patch23:        b8fa0c6b-xmlnsqemu-order-XML-output-like-libvirt-does.patch
-Patch24:        
d2648d81-virtconv-dont-implicitly-depend-on-dict-hash-order.patch
-Patch25:        
999dbb36-cli-Make-VirtCLIArgument-instantiation-less-crazy.patch
-Patch26:        7f1b4cee-pycodestyle-fix-all-E125-warnings.patch
-Patch27:        d82022bd-manager-drop-python2-only-cmp-usage.patch
-Patch28:        374a3779-urlfetcher-write-test-file-as-binary-content.patch
-Patch29:        f7c8cf9f-devicepanic-dont-return-empty-model-list.patch
-Patch30:        
3be78d1f-addhardware-dont-allow-panic-option-where-not-supported.patch
-Patch31:        73de8285-systray-remove-redundant-variable-assignment.patch
-Patch32:        b9bc3b60-undefine-only-persistent-domain.patch
-Patch33:        7fc7e94f-fix-virtio-scsi-controller-target-calculation.patch
-Patch34:        2eb455c9-correctly-calculate-virtio-scsi-controller-index.patch
-Patch35:        f836e47b-virtinst-Fix-URLFetcher-for-reading-files.patch
-Patch36:        c174b550-connection-Another-py3-exception-variable-fix.patch
 # SUSE Only
 Patch70:        virtman-desktop.patch
 Patch71:        virtman-kvm.patch
@@ -116,6 +80,7 @@
 Patch167:       virtinst-no-usb-tablet-for-xenpv.patch
 Patch168:       virtinst-add-sle15-detection-support.patch
 Patch169:       virtinst-keep-install-iso-attached.patch
+Patch170:       virtinst-osdict-get_supported.patch
 # Python2 to Python3 patches
 Patch200:       virtmisc-python2-to-python3-conversion.patch
 Patch201:       virtcli-python2-to-python3-conversion.patch
@@ -123,18 +88,10 @@
 Patch203:       virtinst-python2-to-python3-conversion.patch
 Patch204:       virtman-python2-to-python3-conversion.patch
 Patch205:       virttests-python2-to-python3-conversion.patch
-Patch206:       0001-virtinst-python3-terminal-width-should-be-int.patch
-Patch207:       0002-virtinst-python3-avoid-comparison-of-None-and-int.patch
-Patch208:       0003-virtinst-python3-avoid-using-long-type.patch
-Patch209:       0004-virtinst-python3-use-binary-mode-for-kernel.patch
-Patch210:       virtman-register-delete-event-for-details-dialog.patch
-Patch211:       python3-fix-bytes-string-mess-in-serial-console.patch
-Patch212:       0001-py3-store-exception-variables-for-use-outside-except.patch
-# For upstream review
-Patch500:       0001-Improve-container-image-url-example.patch
-Patch501:       0002-create-wizard-fix-alignment-in-os-container-page.patch
-Patch502:       0003-oscontainer-ask-root-password-in-the-wizard.patch
-Patch503:       0004-Harmonize-invisible_char-values.patch
+Patch206:       0002-virtinst-python3-avoid-comparison-of-None-and-int.patch
+Patch207:       0003-virtinst-python3-avoid-using-long-type.patch
+Patch208:       0004-virtinst-python3-use-binary-mode-for-kernel.patch
+Patch209:       virtman-register-delete-event-for-details-dialog.patch
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -219,42 +176,6 @@
 %prep
 %setup -q
 # Upstream Patches
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
 # SUSE Only
 %patch70 -p1
 %patch71 -p1
@@ -297,6 +218,7 @@
 %patch167 -p1
 %patch168 -p1
 %patch169 -p1
+%patch170 -p1
 # Python2 to Python3 patches
 %patch200 -p1
 %patch201 -p1
@@ -308,13 +230,6 @@
 %patch207 -p1
 %patch208 -p1
 %patch209 -p1
-%patch210 -p1
-%patch211 -p1
-%patch212 -p1
-%patch500 -p1
-%patch501 -p1
-%patch502 -p1
-%patch503 -p1
 
 %build
 %if %{qemu_user}

++++++ virt-manager-1.4.3.tar.bz2 -> virt-manager-1.5.0.tar.bz2 ++++++
++++ 240966 lines of diff (skipped)

++++++ virtinst-add-caasp-support.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.577875568 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.577875568 +0100
@@ -1,10 +1,10 @@
 References: bsc#1010060
 
-Index: virt-manager-1.4.3/virtinst/urlfetcher.py
+Index: virt-manager-1.5.0/virtinst/urlfetcher.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.4.3/virtinst/urlfetcher.py
-@@ -466,6 +466,10 @@ def _distroFromSUSEContent(fetcher, arch
+--- 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
              dclass = OESDistro
              if distro_version is None:
                  distro_version = _parse_sle_distribution(distribution)
@@ -15,7 +15,7 @@
          elif re.match(".*openSUSE.*", distribution[1]):
              dclass = OpensuseDistro
              if distro_version is None:
-@@ -1052,6 +1056,8 @@ class SuseDistro(Distro):
+@@ -1076,6 +1080,8 @@ class SuseDistro(Distro):
                  self.os_variant += major_version + 'sp' + sp_version
              else:
                  self.os_variant += major_version
@@ -24,7 +24,7 @@
          else:
              self.os_variant += "9"
  
-@@ -1098,6 +1104,11 @@ class SLESDistro(SuseDistro):
+@@ -1122,6 +1128,11 @@ class SLESDistro(SuseDistro):
  class SLEDDistro(SuseDistro):
      urldistro = "sled"
  

++++++ virtinst-add-ppc64-arch-support.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.585875280 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.585875280 +0100
@@ -1,10 +1,10 @@
 Reference: bnc#869024
 Add s390x and ppc64 support
-Index: virt-manager-1.4.2/virtinst/urlfetcher.py
+Index: virt-manager-1.5.0/virtinst/urlfetcher.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.4.2/virtinst/urlfetcher.py
-@@ -440,6 +440,10 @@ def _distroFromSUSEContent(fetcher, arch
+--- virt-manager-1.5.0.orig/virtinst/urlfetcher.py
++++ virt-manager-1.5.0/virtinst/urlfetcher.py
+@@ -464,6 +464,10 @@ def _distroFromSUSEContent(fetcher, arch
              arch = "i586"
          elif cbuf.find("s390x") != -1:
              arch = "s390x"
@@ -15,7 +15,7 @@
  
      def _parse_sle_distribution(d):
          sle_version = d[1].strip().rsplit(' ')[4]
-@@ -998,10 +1002,12 @@ class SuseDistro(Distro):
+@@ -1022,10 +1026,12 @@ class SuseDistro(Distro):
              oldkern += "64"
              oldinit += "64"
  

++++++ virtinst-add-sle15-detection-support.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.597874849 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.597874849 +0100
@@ -6,11 +6,11 @@
 As a fallback, detection is also setup to look at the media.1/products and
 media.1/build files.
 
-Index: virt-manager-1.4.3/virtinst/urlfetcher.py
+Index: virt-manager-1.5.0/virtinst/urlfetcher.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.4.3/virtinst/urlfetcher.py
-@@ -392,7 +392,23 @@ def _distroFromSUSEContent(fetcher, arch
+--- virt-manager-1.5.0.orig/virtinst/urlfetcher.py
++++ virt-manager-1.5.0/virtinst/urlfetcher.py
+@@ -416,7 +416,23 @@ def _distroFromSUSEContent(fetcher, arch
      try:
          cbuf = fetcher.acquireFileContent("content")
      except ValueError:
@@ -35,7 +35,7 @@
  
      distribution = None
      distro_version = None
-@@ -465,7 +481,7 @@ def _distroFromSUSEContent(fetcher, arch
+@@ -489,7 +505,7 @@ def _distroFromSUSEContent(fetcher, arch
      dclass = GenericDistro
      if distribution:
          if re.match(".*SUSE Linux Enterprise Server*", distribution[1]) or \
@@ -44,7 +44,7 @@
              dclass = SLESDistro
              if distro_version is None:
                  distro_version = _parse_sle_distribution(distribution)
-@@ -481,10 +497,13 @@ def _distroFromSUSEContent(fetcher, arch
+@@ -505,10 +521,13 @@ def _distroFromSUSEContent(fetcher, arch
              dclass = CAASPDistro
              if distro_version is None:
                  distro_version = ['VERSION', distribution[1].strip().rsplit(' 
')[6]]
@@ -60,7 +60,7 @@
  
      if distro_version is None:
          return None
-@@ -1003,6 +1022,7 @@ class SLDistro(RHELDistro):
+@@ -1027,6 +1046,7 @@ class SLDistro(RHELDistro):
  
  class SuseDistro(Distro):
      name = "SUSE"
@@ -68,7 +68,7 @@
  
      _boot_iso_paths   = ["boot/boot.iso"]
  
-@@ -1040,8 +1060,11 @@ class SuseDistro(Distro):
+@@ -1064,8 +1084,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()
-@@ -1053,7 +1076,7 @@ class SuseDistro(Distro):
+@@ -1077,7 +1100,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:
-@@ -1077,6 +1100,24 @@ class SuseDistro(Distro):
+@@ -1101,6 +1124,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):
-@@ -1128,8 +1169,6 @@ class OESDistro(SuseDistro):
+@@ -1152,8 +1193,6 @@ class OESDistro(SuseDistro):
      urldistro = "oes"
  
  

++++++ virtinst-detect-oes-distros.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.613874275 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.613874275 +0100
@@ -1,10 +1,10 @@
 Enhancement to correctly detect Open Enterprise Server media is
 selected as the installation source.
-Index: virt-manager-1.4.2/virtinst/urlfetcher.py
+Index: virt-manager-1.5.0/virtinst/urlfetcher.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.4.2/virtinst/urlfetcher.py
-@@ -458,6 +458,10 @@ def _distroFromSUSEContent(fetcher, arch
+--- virt-manager-1.5.0.orig/virtinst/urlfetcher.py
++++ virt-manager-1.5.0/virtinst/urlfetcher.py
+@@ -482,6 +482,10 @@ def _distroFromSUSEContent(fetcher, arch
              dclass = SLEDDistro
              if distro_version is None:
                  distro_version = _parse_sle_distribution(distribution)
@@ -15,7 +15,7 @@
          elif re.match(".*openSUSE.*", distribution[1]):
              dclass = OpensuseDistro
              if distro_version is None:
-@@ -1018,20 +1022,30 @@ class SuseDistro(Distro):
+@@ -1042,20 +1046,30 @@ class SuseDistro(Distro):
          distro_version = self.version_from_content[1].strip()
          version = distro_version.split('.', 1)[0].strip()
          self.os_variant = self.urldistro
@@ -59,7 +59,7 @@
          else:
              self.os_variant += "9"
  
-@@ -1078,6 +1092,9 @@ class SLESDistro(SuseDistro):
+@@ -1102,6 +1116,9 @@ class SLESDistro(SuseDistro):
  class SLEDDistro(SuseDistro):
      urldistro = "sled"
  

++++++ virtinst-fix-sle-distro-parsing.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.621873987 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.625873843 +0100
@@ -1,10 +1,10 @@
 References: bsc#1042709
 
-Index: virt-manager-1.4.2/virtinst/urlfetcher.py
+Index: virt-manager-1.5.0/virtinst/urlfetcher.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.4.2/virtinst/urlfetcher.py
-@@ -446,9 +446,20 @@ def _distroFromSUSEContent(fetcher, arch
+--- virt-manager-1.5.0.orig/virtinst/urlfetcher.py
++++ virt-manager-1.5.0/virtinst/urlfetcher.py
+@@ -470,9 +470,20 @@ def _distroFromSUSEContent(fetcher, arch
              arch = "ppc64le"
  
      def _parse_sle_distribution(d):

++++++ virtinst-nfs-install-sanitize.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.637873412 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.637873412 +0100
@@ -5,11 +5,11 @@
    and carry the latter form around internally"
 We need the RFC version to work correctly whereas redhat's anaconda
 needs their own modified version.
-Index: virt-manager-1.4.2/virtinst/util.py
+Index: virt-manager-1.5.0/virtinst/util.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtinst/util.py
-+++ virt-manager-1.4.2/virtinst/util.py
-@@ -421,3 +421,22 @@ def getInstallRepos():
+--- virt-manager-1.5.0.orig/virtinst/util.py
++++ virt-manager-1.5.0/virtinst/util.py
+@@ -374,3 +374,22 @@ def getInstallRepos():
          return (0, [])
      return lookupZypperRepos(getHostInstallSource())
  
@@ -32,10 +32,10 @@
 +
 +    return url
 +
-Index: virt-manager-1.4.2/virtinst/distroinstaller.py
+Index: virt-manager-1.5.0/virtinst/distroinstaller.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtinst/distroinstaller.py
-+++ virt-manager-1.4.2/virtinst/distroinstaller.py
+--- virt-manager-1.5.0.orig/virtinst/distroinstaller.py
++++ virt-manager-1.5.0/virtinst/distroinstaller.py
 @@ -44,6 +44,8 @@ def _sanitize_url(url):
      """
      Do nothing for http or ftp, but make sure nfs is in the expected format
@@ -45,11 +45,11 @@
      if url.startswith("nfs://"):
          # Convert RFC compliant NFS      nfs://server/path/to/distro
          # to what mount/anaconda expect  nfs:server:/path/to/distro
-Index: virt-manager-1.4.2/virtinst/urlfetcher.py
+Index: virt-manager-1.5.0/virtinst/urlfetcher.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.4.2/virtinst/urlfetcher.py
-@@ -34,6 +34,7 @@ import urlparse
+--- virt-manager-1.5.0.orig/virtinst/urlfetcher.py
++++ virt-manager-1.5.0/virtinst/urlfetcher.py
+@@ -33,6 +33,7 @@ import urlparse
  import requests
  
  from .osdict import OSDB
@@ -57,13 +57,13 @@
  
  
  #########################################################################
-@@ -303,7 +304,8 @@ class _MountedURLFetcher(_LocalURLFetche
+@@ -301,7 +302,8 @@ class _MountedURLFetcher(_LocalURLFetche
+         mountcmd = "/bin/mount"
  
          logging.debug("Preparing mount at " + self._srcdir)
-         if self.location.startswith("nfs:"):
--            cmd = [mountcmd, "-o", "ro", self.location[4:], self._srcdir]
-+            url = util.sanitize_url(self.location)
-+            cmd = [mountcmd, "-o", "ro", url[4:], self._srcdir]
-         else:
-             if stat.S_ISBLK(os.stat(self.location)[stat.ST_MODE]):
-                 mountopt = "ro"
+-        cmd = [mountcmd, "-o", "ro", self.location[4:], self._srcdir]
++        url = util.sanitize_url(self.location)
++        cmd = [mountcmd, "-o", "ro", url[4:], self._srcdir]
+ 
+         logging.debug("mount cmd: %s", cmd)
+         if not self._in_test_suite:

++++++ virtinst-osdict-get_supported.patch ++++++
Some distros are out of support for normal customers but continue
to be supported through LTSS contracts for others. Hence the EOL
date in the osinfo-db file may be past but we want the distro to
continue to show up in the list.

Index: virt-manager-1.4.3/virtinst/osdict.py
===================================================================
--- virt-manager-1.4.3.orig/virtinst/osdict.py
+++ virt-manager-1.4.3/virtinst/osdict.py
@@ -376,8 +376,11 @@ class _OsVariant(object):
         # EOL date. So assume None == EOL, add some manual work arounds.
         # We should fix this in a new libosinfo version, and then drop
         # this hack
+        # SUSE: How to handle EOL distros that still have LTSS support
         if self._is_related_to(["fedora24", "rhel7.0", "debian6",
-            "ubuntu13.04", "win8", "win2k12", "mageia5", "centos7.0"],
+            "ubuntu13.04", "win8", "win2k12", "mageia5", "centos7.0",
+            "sles15", "sles12sp3", "sles12sp2", "sles12sp1", "sles11sp4",
+            "tumbleweed", "opensuse15", "opensuse42.3" ],
             check_clones=False, check_derives=False):
             return True
         return False
++++++ virtinst-python2-to-python3-conversion.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.661872551 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.661872551 +0100
@@ -1,17 +1,17 @@
-Index: virt-manager-1.4.3/virt-install
+Index: virt-manager-1.5.0/virt-install
 ===================================================================
---- virt-manager-1.4.3.orig/virt-install
-+++ virt-manager-1.4.3/virt-install
+--- virt-manager-1.5.0.orig/virt-install
++++ virt-manager-1.5.0/virt-install
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python2
 +#!/usr/bin/python3
  #
  # Copyright 2005-2014 Red Hat, Inc.
  #
-Index: virt-manager-1.4.3/virtinst/uri.py
+Index: virt-manager-1.5.0/virtinst/uri.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/uri.py
-+++ virt-manager-1.4.3/virtinst/uri.py
+--- virt-manager-1.5.0.orig/virtinst/uri.py
++++ virt-manager-1.5.0/virtinst/uri.py
 @@ -19,7 +19,7 @@
  
  import logging
@@ -30,10 +30,10 @@
  
          (self.scheme, self.username, self.hostname,
           self.path, self.query, self.fragment) = self._split(unquoted_uri)
-Index: virt-manager-1.4.3/virtinst/hostkeymap.py
+Index: virt-manager-1.5.0/virtinst/hostkeymap.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/hostkeymap.py
-+++ virt-manager-1.4.3/virtinst/hostkeymap.py
+--- virt-manager-1.5.0.orig/virtinst/hostkeymap.py
++++ virt-manager-1.5.0/virtinst/hostkeymap.py
 @@ -20,6 +20,7 @@
  import logging
  import os
@@ -51,10 +51,10 @@
  
      for key in sorted_keys:
          origkey = key
-Index: virt-manager-1.4.3/virtinst/support.py
+Index: virt-manager-1.5.0/virtinst/support.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/support.py
-+++ virt-manager-1.4.3/virtinst/support.py
+--- virt-manager-1.5.0.orig/virtinst/support.py
++++ virt-manager-1.5.0/virtinst/support.py
 @@ -167,7 +167,7 @@ class _SupportCheck(object):
          self.hv_version = hv_version or {}
          self.hv_libvirt_version = hv_libvirt_version or {}
@@ -64,10 +64,10 @@
          for vstr in versions:
              v = _version_str_to_int(vstr)
              if vstr is not None and v != 0 and v < 7009:
-Index: virt-manager-1.4.3/virtinst/osdict.py
+Index: virt-manager-1.5.0/virtinst/osdict.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/osdict.py
-+++ virt-manager-1.4.3/virtinst/osdict.py
+--- virt-manager-1.5.0.orig/virtinst/osdict.py
++++ virt-manager-1.5.0/virtinst/osdict.py
 @@ -79,7 +79,7 @@ def _sort(tosort, sortpref=None, limit_p
      retlist = []
      sortpref = sortpref or []
@@ -101,10 +101,10 @@
              if typename and typename != osobj.get_typename():
                  continue
              if only_supported and not osobj.get_supported():
-Index: virt-manager-1.4.3/virtinst/guest.py
+Index: virt-manager-1.5.0/virtinst/guest.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/guest.py
-+++ virt-manager-1.4.3/virtinst/guest.py
+--- virt-manager-1.5.0.orig/virtinst/guest.py
++++ virt-manager-1.5.0/virtinst/guest.py
 @@ -434,7 +434,7 @@ class Guest(XMLBuilder):
                  domain.undefine()
              except Exception:
@@ -123,10 +123,10 @@
              if len(devs) > 1 and 0 in devs:
                  devs[0].address.multifunction = True
  
-Index: virt-manager-1.4.3/virtinst/distroinstaller.py
+Index: virt-manager-1.5.0/virtinst/distroinstaller.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/distroinstaller.py
-+++ virt-manager-1.4.3/virtinst/distroinstaller.py
+--- virt-manager-1.5.0.orig/virtinst/distroinstaller.py
++++ virt-manager-1.5.0/virtinst/distroinstaller.py
 @@ -68,7 +68,7 @@ def _sanitize_url(url):
   MEDIA_LOCATION_URL,
   MEDIA_CDROM_PATH,
@@ -136,10 +136,10 @@
  
  
  class DistroInstaller(Installer):
-Index: virt-manager-1.4.3/virtinst/cli.py
+Index: virt-manager-1.5.0/virtinst/cli.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/cli.py
-+++ virt-manager-1.4.3/virtinst/cli.py
+--- virt-manager-1.5.0.orig/virtinst/cli.py
++++ virt-manager-1.5.0/virtinst/cli.py
 @@ -19,7 +19,7 @@
  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  # MA 02110-1301 USA.
@@ -149,7 +149,7 @@
  
  import argparse
  import collections
-@@ -293,7 +293,7 @@ def _do_creds_authname(creds):
+@@ -294,7 +294,7 @@ def _do_creds_authname(creds):
  
          res = cred[retindex]
          if credtype == libvirt.VIR_CRED_AUTHNAME:
@@ -158,7 +158,7 @@
          elif credtype == libvirt.VIR_CRED_PASSPHRASE:
              import getpass
              res = getpass.getpass(prompt)
-@@ -1159,7 +1159,7 @@ class VirtCLIParser(object):
+@@ -1193,7 +1193,7 @@ class VirtCLIParser(object):
          passed an invalid argument such as --disk idontexist=foo
          """
          if optdict:
@@ -167,7 +167,7 @@
  
      def _parse(self, inst):
          """
-@@ -1616,7 +1616,7 @@ class ParserBoot(VirtCLIParser):
+@@ -1681,7 +1681,7 @@ class ParserBoot(VirtCLIParser):
      def _parse(self, inst):
          # Build boot order
          boot_order = []
@@ -176,10 +176,10 @@
              if cliname not in inst.os.BOOT_DEVICES:
                  continue
  
-Index: virt-manager-1.4.3/virtinst/xmlbuilder.py
+Index: virt-manager-1.5.0/virtinst/xmlbuilder.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/xmlbuilder.py
-+++ virt-manager-1.4.3/virtinst/xmlbuilder.py
+--- virt-manager-1.5.0.orig/virtinst/xmlbuilder.py
++++ virt-manager-1.5.0/virtinst/xmlbuilder.py
 @@ -327,7 +327,7 @@ class XMLChildProperty(property):
  
      def _findpropname(self, xmlbuilder):
@@ -290,10 +290,10 @@
              if key not in do_order:
                  do_order.append(key)
  
-Index: virt-manager-1.4.3/virtinst/domcapabilities.py
+Index: virt-manager-1.5.0/virtinst/domcapabilities.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/domcapabilities.py
-+++ virt-manager-1.4.3/virtinst/domcapabilities.py
+--- virt-manager-1.5.0.orig/virtinst/domcapabilities.py
++++ virt-manager-1.5.0/virtinst/domcapabilities.py
 @@ -139,7 +139,7 @@ class DomainCapabilities(XMLBuilder):
                  return _("BIOS")
              return _("None")
@@ -312,10 +312,10 @@
  
      def supports_uefi_xml(self):
          """
-Index: virt-manager-1.4.3/virtinst/devicedisk.py
+Index: virt-manager-1.5.0/virtinst/devicedisk.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/devicedisk.py
-+++ virt-manager-1.4.3/virtinst/devicedisk.py
+--- virt-manager-1.5.0.orig/virtinst/devicedisk.py
++++ virt-manager-1.5.0/virtinst/devicedisk.py
 @@ -87,7 +87,7 @@ def _is_dir_searchable(uid, username, pa
          logging.debug("Cmd '%s' failed: %s", cmd, err)
          return False
@@ -324,8 +324,8 @@
 +    return bool(re.search("user:%s:..x" % username, out.decode()))
  
  
- class _DiskSeclabel(XMLBuilder):
-@@ -445,7 +445,7 @@ class VirtualDisk(VirtualDevice):
+ class _Host(XMLBuilder):
+@@ -453,7 +453,7 @@ class VirtualDisk(VirtualDevice):
                  digit = 1
  
              seen_valid = True
@@ -334,7 +334,7 @@
  
          return gen_t
  
-@@ -1022,11 +1022,11 @@ class VirtualDisk(VirtualDevice):
+@@ -1054,11 +1054,11 @@ class VirtualDisk(VirtualDevice):
          def get_target():
              first_found = None
  
@@ -348,10 +348,10 @@
  
              for i in ran:
                  postfix = self.num_to_target(i + 1)
-Index: virt-manager-1.4.3/virtinst/storage.py
+Index: virt-manager-1.5.0/virtinst/storage.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/storage.py
-+++ virt-manager-1.4.3/virtinst/storage.py
+--- virt-manager-1.5.0.orig/virtinst/storage.py
++++ virt-manager-1.5.0/virtinst/storage.py
 @@ -130,7 +130,7 @@ class StoragePool(_StorageObject):
          """
          Return list of appropriate pool types
@@ -361,10 +361,10 @@
  
      @staticmethod
      def get_pool_type_desc(pool_type):
-Index: virt-manager-1.4.3/virtinst/devicegraphics.py
+Index: virt-manager-1.5.0/virtinst/devicegraphics.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/devicegraphics.py
-+++ virt-manager-1.4.3/virtinst/devicegraphics.py
+--- virt-manager-1.5.0.orig/virtinst/devicegraphics.py
++++ virt-manager-1.5.0/virtinst/devicegraphics.py
 @@ -84,7 +84,7 @@ class VirtualGraphics(VirtualDevice):
          """
          from . import hostkeymap
@@ -374,10 +374,10 @@
          sort_list = []
  
          orig_list.sort()
-Index: virt-manager-1.4.3/virtinst/util.py
+Index: virt-manager-1.5.0/virtinst/util.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/util.py
-+++ virt-manager-1.4.3/virtinst/util.py
+--- virt-manager-1.5.0.orig/virtinst/util.py
++++ virt-manager-1.5.0/virtinst/util.py
 @@ -147,7 +147,7 @@ def generate_name(base, collision_cb, su
          else:
              return collision_cb(tryname)
@@ -387,10 +387,10 @@
      if not force_num:
          numrange = [None] + numrange
  
-Index: virt-manager-1.4.3/virtinst/urlfetcher.py
+Index: virt-manager-1.5.0/virtinst/urlfetcher.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.4.3/virtinst/urlfetcher.py
+--- virt-manager-1.5.0.orig/virtinst/urlfetcher.py
++++ virt-manager-1.5.0/virtinst/urlfetcher.py
 @@ -19,7 +19,7 @@
  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  # MA 02110-1301 USA.
@@ -400,8 +400,8 @@
  import ftplib
  import io
  import logging
-@@ -28,8 +28,8 @@ import re
- import stat
+@@ -27,8 +27,8 @@ import os
+ import re
  import subprocess
  import tempfile
 -import urllib2
@@ -411,7 +411,7 @@
  
  import requests
  
-@@ -221,9 +221,13 @@ class _FTPURLFetcher(_URLFetcher):
+@@ -220,9 +220,13 @@ class _FTPURLFetcher(_URLFetcher):
              return
  
          try:
@@ -427,7 +427,7 @@
              self._ftp.login()
              # Force binary mode
              self._ftp.voidcmd("TYPE I")
-@@ -235,9 +239,9 @@ class _FTPURLFetcher(_URLFetcher):
+@@ -234,9 +238,9 @@ class _FTPURLFetcher(_URLFetcher):
          """
          Use urllib2 and ftplib to grab the file
          """
@@ -440,7 +440,7 @@
          return urlobj, size
  
  
-@@ -253,7 +257,7 @@ class _FTPURLFetcher(_URLFetcher):
+@@ -252,7 +256,7 @@ class _FTPURLFetcher(_URLFetcher):
          self._ftp = None
  
      def _hasFile(self, url):
@@ -449,7 +449,7 @@
  
          try:
              try:
-@@ -278,7 +282,7 @@ class _LocalURLFetcher(_URLFetcher):
+@@ -277,7 +281,7 @@ class _LocalURLFetcher(_URLFetcher):
          return os.path.exists(url)
  
      def _grabber(self, url):
@@ -458,7 +458,7 @@
          size = os.path.getsize(url)
          return urlobj, size
  
-@@ -371,14 +375,14 @@ def _grabTreeinfo(fetcher):
+@@ -395,14 +399,14 @@ def _grabTreeinfo(fetcher):
          return None
  
      try:
@@ -475,7 +475,7 @@
          logging.debug("Did not find 'family' section in treeinfo")
          return None
  
-@@ -391,11 +395,13 @@ def _distroFromSUSEContent(fetcher, arch
+@@ -415,11 +419,13 @@ def _distroFromSUSEContent(fetcher, arch
      # None if no content, GenericDistro if unknown label type.
      try:
          cbuf = fetcher.acquireFileContent("content")
@@ -489,7 +489,7 @@
              pbuf = pbuf.split(' ', 1)[1].strip()
              # The media.1/products file naming convention changed between 
SLE11 and SLE12
              if pbuf.startswith('SLE'):
-@@ -404,6 +410,7 @@ def _distroFromSUSEContent(fetcher, arch
+@@ -428,6 +434,7 @@ def _distroFromSUSEContent(fetcher, arch
              cbuf = "\nDISTRO ," + pbuf.replace('-', ' ')
              try:
                  bbuf = fetcher.acquireFileContent("media.1/build").split('-')
@@ -497,7 +497,7 @@
              except:
                  bbuf = ["x86_64"]
              cbuf = cbuf + "\n" + " ".join(bbuf)
-@@ -621,7 +628,7 @@ class Distro(object):
+@@ -645,7 +652,7 @@ class Distro(object):
              try:
                  kernelpath = self._getTreeinfoMedia("kernel")
                  initrdpath = self._getTreeinfoMedia("initrd")
@@ -506,7 +506,7 @@
                  pass
  
          if not kernelpath or not initrdpath:
-@@ -688,6 +695,7 @@ class Distro(object):
+@@ -712,6 +719,7 @@ class Distro(object):
          # Fetch 'filename' and return True/False if it matches the regex
          try:
              content = self.fetcher.acquireFileContent(filename)
@@ -514,7 +514,7 @@
          except ValueError:
              return False
  
-@@ -757,15 +765,15 @@ class GenericDistro(Distro):
+@@ -781,15 +789,15 @@ class GenericDistro(Distro):
                      self._valid_kernel_path = (
                          self._getTreeinfoMedia("kernel"),
                          self._getTreeinfoMedia("initrd"))
@@ -533,7 +533,7 @@
                      logging.debug(e)
  
          if self.type == "xen":
-@@ -1440,7 +1448,7 @@ class ALTLinuxDistro(Distro):
+@@ -1472,7 +1480,7 @@ class ALTLinuxDistro(Distro):
  # Build list of all *Distro classes
  def _build_distro_list():
      allstores = []
@@ -542,10 +542,10 @@
          if isinstance(obj, type) and issubclass(obj, Distro) and obj.name:
              allstores.append(obj)
  
-Index: virt-manager-1.4.3/virtinst/diskbackend.py
+Index: virt-manager-1.5.0/virtinst/diskbackend.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/diskbackend.py
-+++ virt-manager-1.4.3/virtinst/diskbackend.py
+--- virt-manager-1.5.0.orig/virtinst/diskbackend.py
++++ virt-manager-1.5.0/virtinst/diskbackend.py
 @@ -391,7 +391,7 @@ class CloneStorageCreator(_StorageCreato
          else:
              vfs = os.statvfs(os.path.dirname(self._path))
@@ -564,10 +564,10 @@
          progresscb.start(filename=self._output_path, size=size_bytes,
                           text=text)
  
-Index: virt-manager-1.4.3/virtinst/progress.py
+Index: virt-manager-1.5.0/virtinst/progress.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/progress.py
-+++ virt-manager-1.4.3/virtinst/progress.py
+--- virt-manager-1.5.0.orig/virtinst/progress.py
++++ virt-manager-1.5.0/virtinst/progress.py
 @@ -481,7 +481,7 @@ def format_number(number, SI=0, space='
          depth  = depth + 1
          number = number / step
@@ -577,10 +577,10 @@
          # it's an int or a long, which means it didn't get divided,
          # which means it's already short enough
          fmt = '%i%s%s'
-Index: virt-manager-1.4.3/virtinst/pollhelpers.py
+Index: virt-manager-1.5.0/virtinst/pollhelpers.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/pollhelpers.py
-+++ virt-manager-1.4.3/virtinst/pollhelpers.py
+--- virt-manager-1.5.0.orig/virtinst/pollhelpers.py
++++ virt-manager-1.5.0/virtinst/pollhelpers.py
 @@ -50,7 +50,7 @@ def _new_poll_helper(origmap, typename,
              current[connkey] = origmap[connkey]
              del(origmap[connkey])

++++++ virtinst-s390x-disable-graphics.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.673872120 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.673872120 +0100
@@ -1,10 +1,10 @@
 Reference: bnc#869024
 Disable graphics on s390x
-Index: virt-manager-1.4.3/virtinst/guest.py
+Index: virt-manager-1.5.0/virtinst/guest.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/guest.py
-+++ virt-manager-1.4.3/virtinst/guest.py
-@@ -125,7 +125,10 @@ class Guest(XMLBuilder):
+--- virt-manager-1.5.0.orig/virtinst/guest.py
++++ virt-manager-1.5.0/virtinst/guest.py
+@@ -126,7 +126,10 @@ class Guest(XMLBuilder):
          self.skip_default_channel = False
          self.skip_default_sound = False
          self.skip_default_usbredir = False

++++++ virtinst-storage-ocfs2.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.689871546 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.689871546 +0100
@@ -1,9 +1,9 @@
 Enhancement to add ocfs2 as a supported FS type
-Index: virt-manager-1.4.2/virtinst/storage.py
+Index: virt-manager-1.5.0/virtinst/storage.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtinst/storage.py
-+++ virt-manager-1.4.2/virtinst/storage.py
-@@ -467,7 +467,7 @@ class StoragePool(_StorageObject):
+--- virt-manager-1.5.0.orig/virtinst/storage.py
++++ virt-manager-1.5.0/virtinst/storage.py
+@@ -460,7 +460,7 @@ class StoragePool(_StorageObject):
      def list_formats(self):
          if self.type == self.TYPE_FS:
              return ["auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf",

++++++ virtinst-use-qemu-for-cdrom-device.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.697871258 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.701871115 +0100
@@ -2,11 +2,11 @@
 When the device added is a cdrom device (/dev/sr0), don't use
 "phy" as the driver name but instead use "qemu".
 
-Index: virt-manager-1.4.2/virtinst/devicedisk.py
+Index: virt-manager-1.5.0/virtinst/devicedisk.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtinst/devicedisk.py
-+++ virt-manager-1.4.2/virtinst/devicedisk.py
-@@ -552,7 +552,8 @@ class VirtualDisk(VirtualDevice):
+--- virt-manager-1.5.0.orig/virtinst/devicedisk.py
++++ virt-manager-1.5.0/virtinst/devicedisk.py
+@@ -561,7 +561,8 @@ class VirtualDisk(VirtualDevice):
          # Recommended xen defaults from here:
          # https://bugzilla.redhat.com/show_bug.cgi?id=1171550#c9
          # If type block, use name=phy. Otherwise do the same as qemu

++++++ virtinst-use-xenpae-kernel-for-32bit.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.713870683 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.713870683 +0100
@@ -4,11 +4,11 @@
 virtualized if the pae kernel is selected.
 Note that sles12 and newer has no 32bit release.
 
-Index: virt-manager-1.4.2/virtinst/urlfetcher.py
+Index: virt-manager-1.5.0/virtinst/urlfetcher.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.4.2/virtinst/urlfetcher.py
-@@ -1025,8 +1025,12 @@ class SuseDistro(Distro):
+--- virt-manager-1.5.0.orig/virtinst/urlfetcher.py
++++ virt-manager-1.5.0/virtinst/urlfetcher.py
+@@ -1049,8 +1049,12 @@ class SuseDistro(Distro):
                                             "boot/%s/initrd" % self.arch))
  
              # Matches Opensuse > 10.2 and sles 10

++++++ virtinst-vol-default-nocow.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.721870396 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.721870396 +0100
@@ -4,11 +4,11 @@
 
 Signed-off-by: Chunyan Liu <cy...@suse.com>
 
-Index: virt-manager-1.4.3/virtinst/storage.py
+Index: virt-manager-1.5.0/virtinst/storage.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/storage.py
-+++ virt-manager-1.4.3/virtinst/storage.py
-@@ -708,6 +708,12 @@ class StorageVolume(_StorageObject):
+--- virt-manager-1.5.0.orig/virtinst/storage.py
++++ virt-manager-1.5.0/virtinst/storage.py
+@@ -701,6 +701,12 @@ class StorageVolume(_StorageObject):
          return self._pool_xml.get_disk_type()
      file_type = property(_get_vol_type)
  
@@ -21,14 +21,14 @@
  
      ##################
      # XML properties #
-Index: virt-manager-1.4.3/virtinst/support.py
+Index: virt-manager-1.5.0/virtinst/support.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/support.py
-+++ virt-manager-1.4.3/virtinst/support.py
-@@ -325,6 +325,8 @@ SUPPORT_CONN_RNG_URANDOM = _make(version
- SUPPORT_CONN_USB3_PORTS = _make(version="1.3.5")
+--- virt-manager-1.5.0.orig/virtinst/support.py
++++ virt-manager-1.5.0/virtinst/support.py
+@@ -326,6 +326,8 @@ SUPPORT_CONN_USB3_PORTS = _make(version=
  SUPPORT_CONN_MACHVIRT_PCI_DEFAULT = _make(version="3.0.0")
  SUPPORT_CONN_QEMU_XHCI = _make(version="3.3.0")
+ SUPPORT_CONN_VNC_NONE_AUTH = _make(hv_version={"qemu": "2.9.0"})
 +SUPPORT_CONN_NOCOW = _make(
 +    version="1.2.18", hv_version={"qemu": "2.2.0", "test": 0})
  

++++++ virtinst-xen-drive-type.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.729870110 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.733869965 +0100
@@ -2,11 +2,11 @@
 Virt-manager on Xen doesn't fill in any type thereby defaulting to
 'raw'. This patch will generate the correct XML on Xen.
 
-Index: virt-manager-1.4.2/virtinst/devicedisk.py
+Index: virt-manager-1.5.0/virtinst/devicedisk.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtinst/devicedisk.py
-+++ virt-manager-1.4.2/virtinst/devicedisk.py
-@@ -570,6 +570,10 @@ class VirtualDisk(VirtualDevice):
+--- virt-manager-1.5.0.orig/virtinst/devicedisk.py
++++ virt-manager-1.5.0/virtinst/devicedisk.py
+@@ -579,6 +579,10 @@ class VirtualDisk(VirtualDevice):
          http://lists.gnu.org/archive/html/qemu-devel/2008-04/msg00675.html
          """
          if self.driver_name != self.DRIVER_NAME_QEMU:

++++++ virtinst-xenbus-disk-index-fix.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.741869678 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.741869678 +0100
@@ -6,11 +6,11 @@
 passed to qemu where it error'ed out with the disks having the same
 index (in this case both are 0).
 
-Index: virt-manager-1.4.3/virtinst/devicedisk.py
+Index: virt-manager-1.5.0/virtinst/devicedisk.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtinst/devicedisk.py
-+++ virt-manager-1.4.3/virtinst/devicedisk.py
-@@ -1004,6 +1004,17 @@ class VirtualDisk(VirtualDevice):
+--- virt-manager-1.5.0.orig/virtinst/devicedisk.py
++++ virt-manager-1.5.0/virtinst/devicedisk.py
+@@ -1036,6 +1036,17 @@ class VirtualDisk(VirtualDevice):
          @rtype C{str}
          """
          prefix, maxnode = self.get_target_prefix(skip_targets)
@@ -28,7 +28,7 @@
          skip_targets = [t for t in skip_targets if t and t.startswith(prefix)]
          skip_targets.sort()
  
-@@ -1017,7 +1028,12 @@ class VirtualDisk(VirtualDevice):
+@@ -1049,7 +1060,12 @@ class VirtualDisk(VirtualDevice):
                  ran = range(pref_ctrl * 7, (pref_ctrl + 1) * 7)
  
              for i in ran:

++++++ virtman-add-connect-default.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.753869247 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.753869247 +0100
@@ -1,10 +1,10 @@
 Enhancement for when no hypervisor can be found locally it opens
 the new connection dialog.
-Index: virt-manager-1.4.2/virtManager/engine.py
+Index: virt-manager-1.5.0/virtManager/engine.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtManager/engine.py
-+++ virt-manager-1.4.2/virtManager/engine.py
-@@ -236,9 +236,6 @@ class vmmEngine(vmmGObject):
+--- virt-manager-1.5.0.orig/virtManager/engine.py
++++ virt-manager-1.5.0/virtManager/engine.py
+@@ -239,9 +239,6 @@ class vmmEngine(vmmGObject):
          except Exception:
              logging.exception("Error talking to PackageKit")
  
@@ -14,7 +14,7 @@
          warnmsg = _("The 'libvirtd' service will need to be started.\n\n"
                      "After that, virt-manager will connect to libvirt on\n"
                      "the next application start up.")
-@@ -252,7 +249,11 @@ class vmmEngine(vmmGObject):
+@@ -255,7 +252,11 @@ class vmmEngine(vmmGObject):
              if not connected and do_start:
                  manager.err.ok(_("Libvirt service must be started"), warnmsg)
  

++++++ virtman-allow-creating-i686-vm.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.761868960 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.765868817 +0100
@@ -1,11 +1,11 @@
 References: bsc#919692
 Because openSUSE repos combine 32 and 64 bit sources we need to
 continue showing the 'Architecture' pop-up.
-Index: virt-manager-1.4.2/virtManager/create.py
+Index: virt-manager-1.5.0/virtManager/create.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtManager/create.py
-+++ virt-manager-1.4.2/virtManager/create.py
-@@ -847,11 +847,6 @@ class vmmCreate(vmmGObjectUI):
+--- virt-manager-1.5.0.orig/virtManager/create.py
++++ virt-manager-1.5.0/virtManager/create.py
+@@ -849,11 +849,6 @@ class vmmCreate(vmmGObjectUI):
          for guest in self.conn.caps.guests:
              if guest.os_type == self._capsinfo.os_type:
                  archs.append(guest.arch)

++++++ virtman-allow-destroy-from-shutdown-menu-of-crashed-vm.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.773868529 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.773868529 +0100
@@ -6,11 +6,11 @@
 4) Edit the VM's /etc/default/grub file and remove the crashkernel information
    and then run grub2-mkconfig /boot/grub2/grub.cfg.
 5) Start the VM and within the VM's terminal type "echo 'c' > 
/proc/sysrq-trigger"
-Index: virt-manager-1.4.3/virtManager/manager.py
+Index: virt-manager-1.5.0/virtManager/manager.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtManager/manager.py
-+++ virt-manager-1.4.3/virtManager/manager.py
-@@ -843,7 +843,7 @@ class vmmManager(vmmGObjectUI):
+--- virt-manager-1.5.0.orig/virtManager/manager.py
++++ virt-manager-1.5.0/virtManager/manager.py
+@@ -844,7 +844,7 @@ class vmmManager(vmmGObjectUI):
              show_pause = bool(vm and vm.is_unpauseable())
          else:
              show_pause = bool(vm and vm.is_pauseable())
@@ -19,10 +19,10 @@
  
          if vm and vm.managedsave_supported:
              self.change_run_text(vm.has_managed_save())
-Index: virt-manager-1.4.3/virtManager/vmmenu.py
+Index: virt-manager-1.5.0/virtManager/vmmenu.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtManager/vmmenu.py
-+++ virt-manager-1.4.3/virtManager/vmmenu.py
+--- virt-manager-1.5.0.orig/virtManager/vmmenu.py
++++ virt-manager-1.5.0/virtManager/vmmenu.py
 @@ -31,6 +31,7 @@ class _VMMenu(Gtk.Menu):
          self._parent = src
          self._current_vm_cb = current_vm_cb

++++++ virtman-default-guest-from-host-os.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.785868099 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.785868099 +0100
@@ -1,9 +1,9 @@
 Enhancement to default to the host os version when creating a VM
 and media detection of the install source is turned off.
-Index: virt-manager-1.4.3/virtManager/create.py
+Index: virt-manager-1.5.0/virtManager/create.py
 ===================================================================
---- virt-manager-1.4.3.orig/virtManager/create.py
-+++ virt-manager-1.4.3/virtManager/create.py
+--- virt-manager-1.5.0.orig/virtManager/create.py
++++ virt-manager-1.5.0/virtManager/create.py
 @@ -24,6 +24,9 @@ import pkgutil
  import os
  import threading
@@ -14,7 +14,7 @@
  
  from gi.repository import GObject
  from gi.repository import Gtk
-@@ -1505,6 +1508,63 @@ class vmmCreate(vmmGObjectUI):
+@@ -1511,6 +1514,63 @@ class vmmCreate(vmmGObjectUI):
      def _cdrom_changed(self, src):
          self._detectable_media_widget_changed(src)
  
@@ -25,7 +25,7 @@
 +            if m:
 +                sp = m.group(0).strip().lower()
 +            return sp
-+        if sys.platform == 'linux2':
++        if sys.platform.startswith('linux'):
 +            if os.path.exists('/etc/issue'):
 +                f = open('/etc/issue')
 +                lines = f.readlines()
@@ -78,7 +78,7 @@
      def _toggle_detect_os(self, src):
          dodetect = src.get_active()
  
-@@ -1517,6 +1577,8 @@ class vmmCreate(vmmGObjectUI):
+@@ -1523,6 +1583,8 @@ class vmmCreate(vmmGObjectUI):
              self.widget("install-os-version-entry").set_text("")
              self._os_already_detected_for_media = False
              self._start_detect_os_if_needed()

++++++ virtman-default-to-xen-pv.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.793867811 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.793867811 +0100
@@ -1,9 +1,9 @@
 Enhancement to default to PV instead of HVM on Xen host.
-Index: virt-manager-1.4.2/virtManager/create.py
+Index: virt-manager-1.5.0/virtManager/create.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtManager/create.py
-+++ virt-manager-1.4.2/virtManager/create.py
-@@ -757,7 +757,12 @@ class vmmCreate(vmmGObjectUI):
+--- virt-manager-1.5.0.orig/virtManager/create.py
++++ virt-manager-1.5.0/virtManager/create.py
+@@ -759,7 +759,12 @@ class vmmCreate(vmmGObjectUI):
          if gtype is None:
              # If none specified, prefer HVM so install options aren't limited
              # with a default PV choice.

++++++ virtman-increase-setKeepAlive-count.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.813867093 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.813867093 +0100
@@ -6,7 +6,7 @@
 ===================================================================
 --- virt-manager-1.4.3.orig/virtManager/connection.py
 +++ virt-manager-1.4.3/virtManager/connection.py
-@@ -1086,7 +1086,7 @@ class vmmConnection(vmmGObject):
+@@ -1088,7 +1088,7 @@ class vmmConnection(vmmGObject):
          self.caps.get_cpu_values(self.caps.host.cpu.arch)
  
          try:

++++++ virtman-kvm.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.825866662 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.825866662 +0100
@@ -1,10 +1,10 @@
 /usr/bin/kvm doesn't exist on suse distros so check instead for
 /usr/bin/qemu-system-x86_64
-Index: virt-manager-1.4.2/virtManager/connect.py
+Index: virt-manager-1.5.0/virtManager/connect.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtManager/connect.py
-+++ virt-manager-1.4.2/virtManager/connect.py
-@@ -116,7 +116,7 @@ class vmmConnect(vmmGObjectUI):
+--- virt-manager-1.5.0.orig/virtManager/connect.py
++++ virt-manager-1.5.0/virtManager/connect.py
+@@ -117,7 +117,7 @@ class vmmConnect(vmmGObjectUI):
  
          if (os.path.exists("/usr/bin/qemu") or
              os.path.exists("/usr/bin/qemu-kvm") or

++++++ virtman-load-stored-uris.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.837866231 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.841866088 +0100
@@ -1,8 +1,8 @@
-Index: virt-manager-1.3.2/virtManager/engine.py
+Index: virt-manager-1.5.0/virtManager/engine.py
 ===================================================================
---- virt-manager-1.3.2.orig/virtManager/engine.py
-+++ virt-manager-1.3.2/virtManager/engine.py
-@@ -257,9 +257,22 @@ class vmmEngine(vmmGObject):
+--- virt-manager-1.5.0.orig/virtManager/engine.py
++++ virt-manager-1.5.0/virtManager/engine.py
+@@ -260,9 +260,22 @@ class vmmEngine(vmmGObject):
  
      def load_stored_uris(self):
          uris = self.config.get_conn_uris() or []

++++++ virtman-packages.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.849865800 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.849865800 +0100
@@ -4,10 +4,10 @@
 libvirt packages (kvm vs xen). Only install those libvirt packages
 for which the host is booted. This patch has a corresponding spec
 file change (%define libvirt_kvm_packages and %define libvirt_xen_packages).
-Index: virt-manager-1.4.2/setup.py
+Index: virt-manager-1.5.0/setup.py
 ===================================================================
---- virt-manager-1.4.2.orig/setup.py
-+++ virt-manager-1.4.2/setup.py
+--- virt-manager-1.5.0.orig/setup.py
++++ virt-manager-1.5.0/setup.py
 @@ -308,8 +308,11 @@ class configure(distutils.core.Command):
          ("prefix=", None, "installation prefix"),
          ("qemu-user=", None,
@@ -45,10 +45,10 @@
          if self.kvm_package_names is not None:
              template += "hv_packages = %s\n" % self.kvm_package_names
          if self.askpass_package_names is not None:
-Index: virt-manager-1.4.2/virtcli/cliconfig.py
+Index: virt-manager-1.5.0/virtcli/cliconfig.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtcli/cliconfig.py
-+++ virt-manager-1.4.2/virtcli/cliconfig.py
+--- virt-manager-1.5.0.orig/virtcli/cliconfig.py
++++ virt-manager-1.5.0/virtcli/cliconfig.py
 @@ -83,7 +83,8 @@ class _CLIConfig(object):
              _get_param("preferred_distros", ""))
          self.hv_packages = _split_list(_get_param("hv_packages", ""))
@@ -59,11 +59,11 @@
          self.default_graphics = _get_param("default_graphics", "spice")
          self.default_hvs = _split_list(_get_param("default_hvs", ""))
  
-Index: virt-manager-1.4.2/virtManager/config.py
+Index: virt-manager-1.5.0/virtManager/config.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtManager/config.py
-+++ virt-manager-1.4.2/virtManager/config.py
-@@ -172,7 +172,8 @@ class vmmConfig(object):
+--- virt-manager-1.5.0.orig/virtManager/config.py
++++ virt-manager-1.5.0/virtManager/config.py
+@@ -183,7 +183,8 @@ class vmmConfig(object):
          self.default_qemu_user = CLIConfig.default_qemu_user
          self.preferred_distros = CLIConfig.preferred_distros
          self.hv_packages = CLIConfig.hv_packages
@@ -73,11 +73,11 @@
          self.askpass_package = CLIConfig.askpass_package
          self.default_graphics_from_config = CLIConfig.default_graphics
          self.default_hvs = CLIConfig.default_hvs
-Index: virt-manager-1.4.2/virtManager/engine.py
+Index: virt-manager-1.5.0/virtManager/engine.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtManager/engine.py
-+++ virt-manager-1.4.2/virtManager/engine.py
-@@ -226,22 +226,18 @@ class vmmEngine(vmmGObject):
+--- virt-manager-1.5.0.orig/virtManager/engine.py
++++ virt-manager-1.5.0/virtManager/engine.py
+@@ -229,22 +229,18 @@ class vmmEngine(vmmGObject):
  
          ret = None
          try:

++++++ virtman-python2-to-python3-conversion.patch ++++++
++++ 609 lines (skipped)
++++ between 
/work/SRC/openSUSE:Factory/virt-manager/virtman-python2-to-python3-conversion.patch
++++ and 
/work/SRC/openSUSE:Factory/.virt-manager.new/virtman-python2-to-python3-conversion.patch

++++++ virtman-show-suse-install-repos.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.877864795 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.877864795 +0100
@@ -1,11 +1,10 @@
-Enhancement that gets the hosts installation location from
-install.inf and also collects the repos provided by zypper.
+Enhancement that gets installation repos from zypper.
 These locations are then presented as potential installation
-locations when creating a VM.
-Index: virt-manager-1.4.2/virtManager/create.py
+sources when creating a VM.
+Index: virt-manager-1.4.3/virtManager/create.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtManager/create.py
-+++ virt-manager-1.4.2/virtManager/create.py
+--- virt-manager-1.4.3.orig/virtManager/create.py
++++ virt-manager-1.4.3/virtManager/create.py
 @@ -424,7 +424,13 @@ class vmmCreate(vmmGObjectUI):
          self.widget("install-url-entry").set_text("")
          self.widget("install-url-options").set_expanded(False)
@@ -21,10 +20,10 @@
          self._set_distro_labels("-", "-")
  
          # Install import
-Index: virt-manager-1.4.2/virtinst/util.py
+Index: virt-manager-1.4.3/virtinst/util.py
 ===================================================================
---- virt-manager-1.4.2.orig/virtinst/util.py
-+++ virt-manager-1.4.2/virtinst/util.py
+--- virt-manager-1.4.3.orig/virtinst/util.py
++++ virt-manager-1.4.3/virtinst/util.py
 @@ -23,9 +23,12 @@ import os
  import random
  import re
@@ -38,7 +37,7 @@
  
  def listify(l):
      if l is None:
-@@ -317,3 +320,104 @@ def make_meter(quiet):
+@@ -317,3 +320,57 @@ def make_meter(quiet):
      if quiet:
          return progress.BaseMeter()
      return progress.TextMeter(fo=sys.stdout)
@@ -50,57 +49,10 @@
 +    if os.geteuid() != 0:
 +        return None
 +
-+    if os.path.exists('/var/lib/YaST2/install.inf'):
-+        server_ip = server_name = server_dir = inst_mode = None
-+        f = open('/var/lib/YaST2/install.inf')
-+        lines = f.readlines()
-+        f.close()
-+        # Newer install.inf files use RepoURL.  Older versions require 
parsing more fields
-+        for line in lines:
-+            if line.startswith('RepoURL:'):
-+                repo_url = line[:-1].split('?', 1)[0]
-+                repo_url = repo_url.split(' ')
-+                if len(repo_url) > 1:
-+                    if repo_url[1].startswith('ftp:') or 
repo_url[1].startswith('http:') or \
-+                       repo_url[1].startswith('smb:') or 
repo_url[1].startswith('nfs:'):
-+                        _host_repo_url = repo_url[1]
-+                        return repo_url[1]
-+                return None
-+            elif line.startswith('InstMode:'):
-+                inst_mode = line[:-1].split('?', 1)[0]
-+                inst_mode = inst_mode.split(' ')
-+                inst_mode = inst_mode[1]
-+                if inst_mode != 'ftp' and inst_mode != 'http' and inst_mode 
!= 'smb' and inst_mode != 'nfs':
-+                    return None
-+            elif line.startswith('ServerIP:'):
-+                server_ip = line[:-1].split('?', 1)[0]
-+                server_ip = server_ip.split(' ')
-+                server_ip = server_ip[1]
-+            elif line.startswith('ServerName:'):
-+                server_name = line[:-1].split('?', 1)[0]
-+                server_name = server_name.split(' ')
-+                server_name = server_name[1]
-+            elif line.startswith('Serverdir:'):
-+                server_dir = line[:-1].split('?', 1)[0]
-+                server_dir = server_dir.split(' ')
-+                server_dir = server_dir[1]
-+        if inst_mode:
-+            repo_url = inst_mode + "://"
-+            if server_name:
-+                repo_url = repo_url + server_name + "/"
-+                if server_dir:
-+                    repo_url = repo_url + server_dir
-+            elif server_ip:
-+                repo_url = repo_url + server_ip + "/"
-+                if server_dir:
-+                    repo_url = repo_url + server_dir
-+            _host_repo_url = repo_url
-+            return repo_url
-+    else:
-+        (_,zypper_output) = lookupZypperRepos()
-+        if len(zypper_output):
-+            _host_repo_url = zypper_output[0]
-+            return _host_repo_url
++    (_,zypper_output) = lookupZypperRepos()
++    if len(zypper_output):
++        _host_repo_url = zypper_output[0]
++        return _host_repo_url
 +    return None
 +
 +def lookupZypperRepos(dom0_inst_source=None):
@@ -110,7 +62,7 @@
 +        cmd = ['/usr/bin/zypper', 'lr', '-u', '-P', '-E']
 +        p = subprocess.Popen(cmd, stdout=PIPE, stderr=PIPE, env=env)
 +        stdout, stderr = p.communicate()
-+        zypper_output = stdout
++        zypper_output = stdout.decode()
 +        zypper_list = zypper_output.split("\n")
 +        zypper_header = [x.strip(' ') for x in zypper_list[0].split("|")]
 +        uri_index = zypper_header.index("URI")

++++++ virttests-python2-to-python3-conversion.patch ++++++
--- /var/tmp/diff_new_pack.mHkpkh/_old  2018-02-09 15:46:23.885864507 +0100
+++ /var/tmp/diff_new_pack.mHkpkh/_new  2018-02-09 15:46:23.889864364 +0100
@@ -1,8 +1,8 @@
-Index: virt-manager-1.4.3/tests/clitest.py
+Index: virt-manager-1.5.0/tests/clitest.py
 ===================================================================
---- virt-manager-1.4.3.orig/tests/clitest.py
-+++ virt-manager-1.4.3/tests/clitest.py
-@@ -218,7 +218,7 @@ class Command(object):
+--- virt-manager-1.5.0.orig/tests/clitest.py
++++ virt-manager-1.5.0/tests/clitest.py
+@@ -223,7 +223,7 @@ class Command(object):
  
          try:
              conn = None
@@ -11,21 +11,21 @@
                  if self.argv[idx] == "--connect":
                      conn = utils.openconn(self.argv[idx + 1])
                      break
-Index: virt-manager-1.4.3/tests/uitests/utils.py
+Index: virt-manager-1.5.0/tests/uitests/utils.py
 ===================================================================
---- virt-manager-1.4.3.orig/tests/uitests/utils.py
-+++ virt-manager-1.4.3/tests/uitests/utils.py
+--- virt-manager-1.5.0.orig/tests/uitests/utils.py
++++ virt-manager-1.5.0/tests/uitests/utils.py
 @@ -1,4 +1,4 @@
 -from __future__ import print_function
 +
  
+ import logging
  import os
- import re
-Index: virt-manager-1.4.3/tests/utils.py
+Index: virt-manager-1.5.0/tests/utils.py
 ===================================================================
---- virt-manager-1.4.3.orig/tests/utils.py
-+++ virt-manager-1.4.3/tests/utils.py
-@@ -96,11 +96,11 @@ def openconn(uri):
+--- virt-manager-1.5.0.orig/tests/utils.py
++++ virt-manager-1.5.0/tests/utils.py
+@@ -104,11 +104,11 @@ def openconn(uri):
          conn.fetch_all_nodedevs()
  
          _conn_cache[uri] = {}
@@ -39,10 +39,10 @@
          conn._fetch_cache[key] = value[:]
  
      def cb_cache_new_pool(poolobj):
-Index: virt-manager-1.4.3/tests/test_inject.py
+Index: virt-manager-1.5.0/tests/test_inject.py
 ===================================================================
---- virt-manager-1.4.3.orig/tests/test_inject.py
-+++ virt-manager-1.4.3/tests/test_inject.py
+--- virt-manager-1.5.0.orig/tests/test_inject.py
++++ virt-manager-1.5.0/tests/test_inject.py
 @@ -1,7 +1,7 @@
  #!/usr/bin/env python2
  # Copyright (C) 2013, 2014 Red Hat, Inc.
@@ -52,7 +52,7 @@
  
  import atexit
  import os
-@@ -29,7 +29,7 @@ FEDORA_URL = "http://dl.fedoraproject.or
+@@ -30,7 +30,7 @@ FEDORA_URL = "http://dl.fedoraproject.or
  
  (WARN_RHEL4,
   WARN_RHEL5,
@@ -61,7 +61,7 @@
  
  
  def prompt():
-@@ -185,7 +185,7 @@ def _make_tests():
+@@ -186,7 +186,7 @@ def _make_tests():
          return lambda s: _test_distro(_d)
  
      idx = 0
@@ -70,23 +70,23 @@
          idx += 1
          setattr(FetchTests, "testFetch%.3d_%s" %
                  (idx, dname.replace("-", "_")), _make_fetch_cb(dobj))
-Index: virt-manager-1.4.3/tests/test_urls.py
+Index: virt-manager-1.5.0/tests/test_urls.py
 ===================================================================
---- virt-manager-1.4.3.orig/tests/test_urls.py
-+++ virt-manager-1.4.3/tests/test_urls.py
-@@ -346,7 +346,7 @@ def _make_tests():
-             d.distroclass = None
-             urls[d.name] = d
+--- virt-manager-1.5.0.orig/tests/test_urls.py
++++ virt-manager-1.5.0/tests/test_urls.py
+@@ -253,7 +253,7 @@ def _make_tests():
+                        vals.get("testshortcircuit", "0") == "1")
+         urls[d.name] = d
  
 -    keys = urls.keys()
 +    keys = list(urls.keys())
      keys.sort()
      for key in keys:
          distroobj = urls[key]
-Index: virt-manager-1.4.3/tests/virtconvtest.py
+Index: virt-manager-1.5.0/tests/virtconvtest.py
 ===================================================================
---- virt-manager-1.4.3.orig/tests/virtconvtest.py
-+++ virt-manager-1.4.3/tests/virtconvtest.py
+--- virt-manager-1.5.0.orig/tests/virtconvtest.py
++++ virt-manager-1.5.0/tests/virtconvtest.py
 @@ -15,7 +15,7 @@
  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  # MA 02110-1301 USA.
@@ -96,10 +96,10 @@
  
  import glob
  import io
-Index: virt-manager-1.4.3/tests/nodedev.py
+Index: virt-manager-1.5.0/tests/nodedev.py
 ===================================================================
---- virt-manager-1.4.3.orig/tests/nodedev.py
-+++ virt-manager-1.4.3/tests/nodedev.py
+--- virt-manager-1.5.0.orig/tests/nodedev.py
++++ virt-manager-1.5.0/tests/nodedev.py
 @@ -69,7 +69,7 @@ class TestNodeDev(unittest.TestCase):
  
      def _testCompare(self, devname, vals, devxml=None):


Reply via email to