Hello community,
here is the log from the commit of package virt-manager for openSUSE:Factory
checked in at 2019-02-13 10:09:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virt-manager (Old)
and /work/SRC/openSUSE:Factory/.virt-manager.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-manager"
Wed Feb 13 10:09:00 2019 rev:190 rq:674346 version:2.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes
2019-02-02 21:50:14.603929146 +0100
+++ /work/SRC/openSUSE:Factory/.virt-manager.new.28833/virt-manager.changes
2019-02-13 10:09:37.857496580 +0100
@@ -1,0 +2,28 @@
+Tue Feb 12 13:34:26 MST 2019 - carn...@suse.com
+
+- Upstream bug fixes (bsc#1027942)
+ f7508d02-addhardware-Fix-setting-optimal-default-net-model.patch
+ 1018ab44-inspection-handle-failures-in-application-listing.patch
+ ae8a4f3d-engine-Fix-first-run-startup-error.patch
+
+-------------------------------------------------------------------
+Mon Feb 4 10:16:11 MST 2019 - carn...@suse.com
+
+- Update to virt-manager 2.1.0 (fate#326786)
+ virt-manager-2.1.0.tar.bz2
+ virtman-fix-env-script-interpreter.patch
+ * Bash autocompletion support (Lin Ma, Cole Robinson)
+ * UI and command line –vsock support (Slavomir Kaslev)
+ * virt-xml: Add –os-variant option (Andrea Bolognani)
+ * virt-install: use libosinfo cpu, mem, disk size defaults (Fabiano Fidencio)
+ * virt-install: Better usage of libosinfo -unknown distro IDs (Fabiano
Fidencio)
+ * virt-install: More usage of libosinfo for ISO –location detection
+ * virt-install: Add –location LOCATION,kernel=X,initrd=Y for pointing to
kernel/initrd in media that virt-install/libosinfo fails to detect
+- Drop
+ 25b88733-urldetect-Dont-overload-suse_content-variable.patch
+ 9308bae3-util-Fix-typo-vpcu-vcpu.patch
+ b8aff280-virtinst-quickfix-ubuntu-net-preseed-insert-cdrom-error.patch
+ c30b3bc6-increase-timeout-for-vm-to-start.patch
+ virtinst-use-latest-opensuse-version-when-unknown-media.patch
+
+-------------------------------------------------------------------
Old:
----
25b88733-urldetect-Dont-overload-suse_content-variable.patch
9308bae3-util-Fix-typo-vpcu-vcpu.patch
b8aff280-virtinst-quickfix-ubuntu-net-preseed-insert-cdrom-error.patch
c30b3bc6-increase-timeout-for-vm-to-start.patch
virt-manager-2.0.0.tar.bz2
virtinst-use-latest-opensuse-version-when-unknown-media.patch
New:
----
1018ab44-inspection-handle-failures-in-application-listing.patch
ae8a4f3d-engine-Fix-first-run-startup-error.patch
f7508d02-addhardware-Fix-setting-optimal-default-net-model.patch
virt-manager-2.1.0.tar.bz2
virtman-fix-env-script-interpreter.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virt-manager.spec ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:10.113488305 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:10.117488304 +0100
@@ -21,7 +21,7 @@
%global default_hvs "qemu,xen,lxc"
Name: virt-manager
-Version: 2.0.0
+Version: 2.1.0
Release: 0
Summary: Virtual Machine Manager
License: GPL-2.0-or-later
@@ -32,10 +32,9 @@
Source2: virt-install.desktop
Source3: virt-manager-supportconfig
# Upstream Patches
-Patch1:
b8aff280-virtinst-quickfix-ubuntu-net-preseed-insert-cdrom-error.patch
-Patch2: 25b88733-urldetect-Dont-overload-suse_content-variable.patch
-Patch3: 9308bae3-util-Fix-typo-vpcu-vcpu.patch
-Patch4: c30b3bc6-increase-timeout-for-vm-to-start.patch
+Patch1:
f7508d02-addhardware-Fix-setting-optimal-default-net-model.patch
+Patch2:
1018ab44-inspection-handle-failures-in-application-listing.patch
+Patch3: ae8a4f3d-engine-Fix-first-run-startup-error.patch
# SUSE Only
Patch70: virtman-desktop.patch
Patch71: virtman-kvm.patch
@@ -44,6 +43,7 @@
Patch74: virtman-dont-allow-grub.xen-to-be-deleted.patch
Patch75: virtinst-pvgrub2-bootloader.patch
Patch76: virtinst-change-location-for-grub_xen.patch
+Patch77: virtman-fix-env-script-interpreter.patch
# Features or Enhancements
Patch101: virtman-default-guest-from-host-os.patch
Patch102: virtman-default-to-xen-pv.patch
@@ -72,7 +72,6 @@
Patch165: virtinst-keep-install-iso-attached.patch
Patch166: virtinst-osdict-get_supported.patch
Patch167: virtinst-dont-use-special-copy-cpu-features.patch
-Patch168: virtinst-use-latest-opensuse-version-when-unknown-media.patch
# Python2 to Python3 patches
Patch200: virtconv-python2-to-python3-conversion.patch
Patch201: virtinst-python2-to-python3-conversion.patch
@@ -166,7 +165,6 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
# SUSE Only
%patch70 -p1
%patch71 -p1
@@ -175,6 +173,7 @@
%patch74 -p1
%patch75 -p1
%patch76 -p1
+%patch77 -p1
# Enhancements
%patch101 -p1
%patch102 -p1
@@ -203,7 +202,6 @@
%patch165 -p1
%patch166 -p1
%patch167 -p1
-%patch168 -p1
# Python2 to Python3 patches
%patch200 -p1
%patch201 -p1
@@ -296,9 +294,13 @@
%{_mandir}/man1/virt-xml.1*
%{_datadir}/%{name}/virt-install
+%{_datadir}/bash-completion/completions/virt-install
%{_datadir}/%{name}/virt-clone
+%{_datadir}/bash-completion/completions/virt-clone
%{_datadir}/%{name}/virt-convert
+%{_datadir}/bash-completion/completions/virt-convert
%{_datadir}/%{name}/virt-xml
+%{_datadir}/bash-completion/completions/virt-xml
%dir %{_datadir}/YaST2
%dir %{_datadir}/YaST2/clients
%dir %{_datadir}/applications/YaST2
++++++ 0002-virtinst-python3-avoid-comparison-of-None-and-int.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:10.173488289 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:10.173488289 +0100
@@ -14,11 +14,11 @@
virtinst/progress.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-Index: virt-manager-2.0.0/virtinst/progress.py
+Index: virt-manager-2.1.0/virtinst/progress.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/progress.py
-+++ virt-manager-2.0.0/virtinst/progress.py
-@@ -321,7 +321,7 @@ class RateEstimator:
+--- virt-manager-2.1.0.orig/virtinst/progress.py
++++ virt-manager-2.1.0/virtinst/progress.py
+@@ -350,7 +350,7 @@ class RateEstimator:
self.start_time = now
self.last_update_time = now
self.last_amount_read = 0
@@ -26,8 +26,8 @@
+ self.ave_rate = 0
def update(self, amount_read, now=None):
- if now is None: now = time.time()
-@@ -333,7 +333,7 @@ class RateEstimator:
+ if now is None:
+@@ -363,7 +363,7 @@ class RateEstimator:
# if we just started this file, all bets are off
self.last_update_time = now
self.last_amount_read = amount_read
@@ -35,4 +35,4 @@
+ self.ave_rate = 0
return
- #print 'times', now, self.last_update_time
+ time_diff = now - self.last_update_time
++++++ 0003-virtinst-python3-avoid-using-long-type.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:10.181488287 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:10.181488287 +0100
@@ -12,20 +12,20 @@
virtinst/progress.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-Index: virt-manager-2.0.0/virtinst/progress.py
+Index: virt-manager-2.1.0/virtinst/progress.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/progress.py
-+++ virt-manager-2.0.0/virtinst/progress.py
+--- virt-manager-2.1.0.orig/virtinst/progress.py
++++ virt-manager-2.1.0/virtinst/progress.py
@@ -16,6 +16,7 @@ import math
import fcntl
import struct
import termios
+from six import integer_types
+
# Code from https://mail.python.org/pipermail/python-list/2000-May/033365.html
- def terminal_width(fd=1):
-@@ -464,7 +465,7 @@ def format_number(number, SI=0, space='
- depth = depth + 1
+@@ -506,7 +507,7 @@ def format_number(number, SI=0, space='
+ depth = depth + 1
number = number / step
- if isinstance(number, int):
++++++ 1018ab44-inspection-handle-failures-in-application-listing.patch ++++++
Subject: inspection: handle failures in application listing
From: Pino Toscano ptosc...@redhat.com Tue Feb 5 18:17:42 2019 +0100
Date: Thu Feb 7 09:59:28 2019 -0500:
Git: 1018ab448484f2e5836fb540d253e813bd8cf6d6
The Python binding of libguestfs errors out in case any of the details
(e.g. summary, description) of an application are not proper UTF-8.
This seems a rare situation, which nevertheless causes the failure of
the inspection of a guest, making the rest of the metadata not used.
While these encoding issues are tackled, and fixed in python-libguestfs
(or libguestfs itself), gracefully handle the failure of
inspect_list_applications(), so at least the rest of the details of a
guest are used/shown.
diff --git a/virtManager/inspection.py b/virtManager/inspection.py
index fde48474..9923dde2 100644
--- a/virtManager/inspection.py
+++ b/virtManager/inspection.py
@@ -275,7 +275,11 @@ class vmmInspection(vmmGObject):
icon = None
# Inspection applications.
- apps = g.inspect_list_applications(root)
+ try:
+ apps = g.inspect_list_applications(root)
+ except Exception:
+ logging.exception("%s: exception while listing apps (ignored)",
+ prettyvm)
# Force the libguestfs handle to close right now.
del g
++++++ ae8a4f3d-engine-Fix-first-run-startup-error.patch ++++++
Subject: engine: Fix first run startup error (bz 1674040)
From: Cole Robinson crobi...@redhat.com Fri Feb 8 15:50:15 2019 -0500
Date: Fri Feb 8 15:50:15 2019 -0500:
Git: ae8a4f3db3c1492a219a0d6ec8d32c765ac076bd
unitpath can be used uninitialized
https://bugzilla.redhat.com/show_bug.cgi?id=1674040
diff --git a/virtManager/engine.py b/virtManager/engine.py
index bf422b36..492c67db 100644
--- a/virtManager/engine.py
+++ b/virtManager/engine.py
@@ -135,6 +135,7 @@ class vmmEngine(vmmGObject):
unitname = "libvirtd.service"
libvirtd_installed = False
libvirtd_active = False
+ unitpath = None
# Fetch all units from systemd
try:
@@ -165,7 +166,7 @@ class vmmEngine(vmmGObject):
# If it's not running, try to start it
try:
- if units and libvirtd_installed and not libvirtd_active:
+ if unitpath and libvirtd_installed and not libvirtd_active:
unit = Gio.DBusProxy.new_sync(
bus, 0, None,
"org.freedesktop.systemd1", unitpath,
++++++ f7508d02-addhardware-Fix-setting-optimal-default-net-model.patch ++++++
Subject: addhardware: Fix setting optimal default net model
From: Cole Robinson crobi...@redhat.com Sun Feb 3 19:47:20 2019 -0500
Date: Sun Feb 3 19:47:54 2019 -0500:
Git: f7508d024d58e54f9da5e7c51f5b805db929b76f
We were unconditionally reseting it to the first list entry
diff --git a/virtManager/addhardware.py b/virtManager/addhardware.py
index eaab8275..69161782 100644
--- a/virtManager/addhardware.py
+++ b/virtManager/addhardware.py
@@ -327,7 +327,6 @@ class vmmAddHardware(vmmGObjectUI):
netmodel = self.widget("net-model")
self.populate_network_model_combo(self.vm, netmodel)
- netmodel.set_active(0)
# Char parameters
++++++ virt-manager-2.0.0.tar.bz2 -> virt-manager-2.1.0.tar.bz2 ++++++
++++ 175642 lines of diff (skipped)
++++++ virtinst-add-caasp-support.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.481487954 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.485487952 +0100
@@ -1,10 +1,10 @@
References: bsc#1010060
-Index: virt-manager-2.0.0/virtinst/urldetect.py
+Index: virt-manager-2.1.0/virtinst/urldetect.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/urldetect.py
-+++ virt-manager-2.0.0/virtinst/urldetect.py
-@@ -238,6 +238,12 @@ class _SUSEContent(object):
+--- virt-manager-2.1.0.orig/virtinst/urldetect.py
++++ virt-manager-2.1.0/virtinst/urldetect.py
+@@ -258,6 +258,12 @@ class _SUSEContent(object):
self.product_name.strip().rsplit(' ')[5][2])
distro_version = sle_version
@@ -17,7 +17,7 @@
return distro_version
-@@ -570,6 +576,9 @@ class SuseDistro(Distro):
+@@ -544,6 +550,9 @@ class _SuseDistro(_RHELDistro):
# Tumbleweed 8 digit date
return "opensusetumbleweed"
@@ -27,17 +27,18 @@
if int(version) < 10:
return self._variant_prefix + "9"
-@@ -645,6 +654,13 @@ class OpensuseDistro(SuseDistro):
+@@ -616,6 +625,14 @@ class _OpensuseDistro(_SuseDistro):
famregex = ".*openSUSE.*"
-+class CAASPDistro(SuseDistro):
++class _CAASPDistro(_SuseDistro):
+ PRETTY_NAME = "SLES"
++ matching_distros = ["caasp"]
+ _variant_prefix = "caasp"
+ _suse_regex = [".*SUSE Container as a Service Platform*", ".*SUSE CaaS
Platform*"]
+ famregex = ".*SUSE Container as a Service Platform.*"
+
+
- class OESDistro(SuseDistro):
+ class _OESDistro(_SuseDistro):
PRETTY_NAME = "OES"
- _variant_prefix = "oes"
+ matching_distros = ["oes"]
++++++ virtinst-add-pvh-support.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.493487950 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.493487950 +0100
@@ -1,10 +1,10 @@
References: fate#326698 - Add pvh support to virt-manager
-Index: virt-manager-2.0.0/virtinst/domain/os.py
+Index: virt-manager-2.1.0/virtinst/domain/os.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/domain/os.py
-+++ virt-manager-2.0.0/virtinst/domain/os.py
-@@ -33,6 +33,8 @@ class DomainOs(XMLBuilder):
+--- virt-manager-2.1.0.orig/virtinst/domain/os.py
++++ virt-manager-2.1.0/virtinst/domain/os.py
+@@ -32,6 +32,8 @@ class DomainOs(XMLBuilder):
return self.os_type == "hvm"
def is_xenpv(self):
return self.os_type in ["xen", "linux"]
@@ -13,11 +13,11 @@
def is_container(self):
return self.os_type == "exe"
-Index: virt-manager-2.0.0/virtinst/guest.py
+Index: virt-manager-2.1.0/virtinst/guest.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/guest.py
-+++ virt-manager-2.0.0/virtinst/guest.py
-@@ -565,7 +565,7 @@ class Guest(XMLBuilder):
+--- virt-manager-2.1.0.orig/virtinst/guest.py
++++ virt-manager-2.1.0/virtinst/guest.py
+@@ -574,7 +574,7 @@ class Guest(XMLBuilder):
usb_tablet = False
usb_keyboard = False
@@ -26,11 +26,11 @@
usb_tablet = self.osinfo.supports_usbtablet()
if self.os.is_arm_machvirt():
usb_tablet = True
-Index: virt-manager-2.0.0/virtManager/domain.py
+Index: virt-manager-2.1.0/virtManager/domain.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/domain.py
-+++ virt-manager-2.0.0/virtManager/domain.py
-@@ -1207,6 +1207,8 @@ class vmmDomain(vmmLibvirtObject):
+--- virt-manager-2.1.0.orig/virtManager/domain.py
++++ virt-manager-2.1.0/virtManager/domain.py
+@@ -1224,6 +1224,8 @@ class vmmDomain(vmmLibvirtObject):
return self.get_xmlobj().os.is_xenpv()
def is_hvm(self):
return self.get_xmlobj().os.is_hvm()
@@ -39,10 +39,10 @@
def get_uuid(self):
if self._uuid is None:
-Index: virt-manager-2.0.0/virtManager/connection.py
+Index: virt-manager-2.1.0/virtManager/connection.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/connection.py
-+++ virt-manager-2.0.0/virtManager/connection.py
+--- virt-manager-2.1.0.orig/virtManager/connection.py
++++ virt-manager-2.1.0/virtManager/connection.py
@@ -229,6 +229,8 @@ class vmmConnection(vmmGObject):
label = "xen (paravirt)"
elif gtype == "hvm":
++++++ virtinst-add-sle15-detection-support.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.501487948 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.505487948 +0100
@@ -1,10 +1,10 @@
References: bsc#1054986
-Index: virt-manager-2.0.0/virtinst/urldetect.py
+Index: virt-manager-2.1.0/virtinst/urldetect.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/urldetect.py
-+++ virt-manager-2.0.0/virtinst/urldetect.py
-@@ -606,6 +606,10 @@ class SuseDistro(Distro):
+--- virt-manager-2.1.0.orig/virtinst/urldetect.py
++++ virt-manager-2.1.0/virtinst/urldetect.py
+@@ -580,6 +580,10 @@ class _SuseDistro(_RHELDistro):
if re.search("openSUSE Tumbleweed", self.cache.treeinfo_name):
return "opensusetumbleweed"
@@ -15,7 +15,7 @@
version, update = self.cache.split_version()
base = self._variant_prefix + str(version)
while update >= 0:
-@@ -613,7 +617,10 @@ class SuseDistro(Distro):
+@@ -587,7 +591,10 @@ class _SuseDistro(_RHELDistro):
# SLE doesn't use '.0' for initial releases in
# osinfo-db (sles11, sles12, etc)
if update > 0 or not base.startswith('sle'):
@@ -27,17 +27,18 @@
if OSDB.lookup_os(tryvar):
return tryvar
update -= 1
-@@ -630,6 +637,13 @@ class SuseDistro(Distro):
- return "install"
+@@ -601,6 +608,14 @@ class _SuseDistro(_RHELDistro):
+ return var
-+class SLEDistro(SuseDistro):
++class _SLEDistro(_SuseDistro):
+ PRETTY_NAME = "SLE"
++ matching_distros = ["sle"]
+ _variant_prefix = "sle"
+ _suse_regex = ["SUSE Linux Enterprise$"]
+ famregex = "SUSE Linux Enterprise$"
+
+
- class SLESDistro(SuseDistro):
+ class _SLESDistro(_SuseDistro):
PRETTY_NAME = "SLES"
matching_distros = ["sles"]
++++++ virtinst-change-location-for-grub_xen.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.513487945 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.513487945 +0100
@@ -1,13 +1,13 @@
References: fate#326960, bsc#1123942
-Index: virt-manager-2.0.0/virtinst/installer.py
+Index: virt-manager-2.1.0/virtinst/installer.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/installer.py
-+++ virt-manager-2.0.0/virtinst/installer.py
-@@ -316,7 +316,10 @@ class Installer(object):
- guest.os.bootloader = "pygrub"
+--- virt-manager-2.1.0.orig/virtinst/installer.py
++++ virt-manager-2.1.0/virtinst/installer.py
+@@ -312,7 +312,10 @@ class Installer(object):
+ guest.bootloader = "pygrub"
else:
- guest.os.bootloader = None
+ guest.bootloader = None
- self._install_kernel = "/usr/lib/grub2/x86_64-xen/grub.xen"
+ if os.path.exists("/usr/share/grub2/x86_64-xen/grub.xen"):
+ self._install_kernel =
"/usr/share/grub2/x86_64-xen/grub.xen"
@@ -16,10 +16,10 @@
self._install_initrd = None
self.extraargs = None
logging.info("Using grub.xen to boot guest")
-Index: virt-manager-2.0.0/virtManager/delete.py
+Index: virt-manager-2.1.0/virtManager/delete.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/delete.py
-+++ virt-manager-2.0.0/virtManager/delete.py
+--- virt-manager-2.1.0.orig/virtManager/delete.py
++++ virt-manager-2.1.0/virtManager/delete.py
@@ -246,7 +246,7 @@ def populate_storage_list(storage_list,
diskdata.append(("dtb", vm.get_xmlobj().os.dtb, True, False, True))
++++++ virtinst-default-xen-to-qcow2-format.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.521487943 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.525487942 +0100
@@ -1,10 +1,10 @@
Reference: bnc#885380
Allow Xen based VMs to default to using qcow2
-Index: virt-manager-2.0.0/virtinst/support.py
+Index: virt-manager-2.1.0/virtinst/support.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/support.py
-+++ virt-manager-2.0.0/virtinst/support.py
-@@ -233,7 +233,7 @@ SUPPORT_CONN_WORKING_XEN_EVENTS = _make(
+--- virt-manager-2.1.0.orig/virtinst/support.py
++++ virt-manager-2.1.0/virtinst/support.py
+@@ -232,7 +232,7 @@ SUPPORT_CONN_WORKING_XEN_EVENTS = _make(
# This is an arbitrary check to say whether it's a good idea to
# default to qcow2. It might be fine for xen or qemu older than the versions
# here, but until someone tests things I'm going to be a bit conservative.
++++++ virtinst-detect-oes-distros.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.529487941 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.529487941 +0100
@@ -1,10 +1,10 @@
Enhancement to correctly detect Open Enterprise Server media is
selected as the installation source.
-Index: virt-manager-2.0.0/virtinst/urldetect.py
+Index: virt-manager-2.1.0/virtinst/urldetect.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/urldetect.py
-+++ virt-manager-2.0.0/virtinst/urldetect.py
-@@ -573,7 +573,7 @@ class SuseDistro(Distro):
+--- virt-manager-2.1.0.orig/virtinst/urldetect.py
++++ virt-manager-2.1.0/virtinst/urldetect.py
+@@ -547,7 +547,7 @@ class _SuseDistro(_RHELDistro):
if int(version) < 10:
return self._variant_prefix + "9"
@@ -13,17 +13,18 @@
sp_version = ""
if len(distro_version.split('.', 1)) == 2:
sp_version = 'sp' + distro_version.split('.', 1)[1].strip()
-@@ -645,6 +645,13 @@ class OpensuseDistro(SuseDistro):
+@@ -616,6 +616,14 @@ class _OpensuseDistro(_SuseDistro):
famregex = ".*openSUSE.*"
-+class OESDistro(SuseDistro):
++class _OESDistro(_SuseDistro):
+ PRETTY_NAME = "OES"
++ matching_distros = ["oes"]
+ _variant_prefix = "oes"
+ _suse_regex = [".*Open Enterprise Server*"]
+ famregex = ".*Open Enterprise Server.*"
+
+
- class DebianDistro(Distro):
+ class _DebianDistro(_DistroTree):
# ex. http://ftp.egr.msu.edu/debian/dists/sarge/main/installer-i386/
# daily builds: https://d-i.debian.org/daily-images/amd64/
++++++ virtinst-dont-use-special-copy-cpu-features.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.537487939 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.541487938 +0100
@@ -12,11 +12,11 @@
and "CPUs" -> "Copy host CPU definition" also inserts 'host-model' so
this change mirrors what is already done there.
-Index: virt-manager-2.0.0/virtinst/domain/cpu.py
+Index: virt-manager-2.1.0/virtinst/domain/cpu.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/domain/cpu.py
-+++ virt-manager-2.0.0/virtinst/domain/cpu.py
-@@ -88,12 +88,16 @@ class DomainCpu(XMLBuilder):
+--- virt-manager-2.1.0.orig/virtinst/domain/cpu.py
++++ virt-manager-2.1.0/virtinst/domain/cpu.py
+@@ -87,12 +87,16 @@ class DomainCpu(XMLBuilder):
val = self.SPECIAL_MODE_HOST_MODEL
if (val == self.SPECIAL_MODE_HOST_MODEL or
++++++ virtinst-keep-install-iso-attached.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.549487936 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.549487936 +0100
@@ -2,11 +2,11 @@
Newer SLE PV guests hang when a cdrom device is attached without
an ISO file.
-Index: virt-manager-2.0.0/virtinst/installer.py
+Index: virt-manager-2.1.0/virtinst/installer.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/installer.py
-+++ virt-manager-2.0.0/virtinst/installer.py
-@@ -103,7 +103,8 @@ class Installer(object):
+--- virt-manager-2.1.0.orig/virtinst/installer.py
++++ virt-manager-2.1.0/virtinst/installer.py
+@@ -105,7 +105,8 @@ class Installer(object):
return
if self.livecd:
return
++++++ virtinst-osdict-get_supported.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.557487935 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.561487933 +0100
@@ -3,11 +3,11 @@
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-2.0.0/virtinst/osdict.py
+Index: virt-manager-2.1.0/virtinst/osdict.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/osdict.py
-+++ virt-manager-2.0.0/virtinst/osdict.py
-@@ -337,7 +337,7 @@ class _OsVariant(object):
+--- virt-manager-2.1.0.orig/virtinst/osdict.py
++++ virt-manager-2.1.0/virtinst/osdict.py
+@@ -321,7 +321,7 @@ class _OsVariant(object):
# If no EOL is present, assume EOL if release was > 5 years ago
if rel is not None:
++++++ virtinst-pvgrub2-bootloader.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.569487931 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.569487931 +0100
@@ -2,11 +2,11 @@
grub.xen is required to boot PV VMs that use the BTRFS filesystem.
This patch forces the use of grub.xen (instead of using pygrub) for
suse distros SLE12GA, openSUSE 13.2, and newer.
-Index: virt-manager-2.0.0/virtinst/installer.py
+Index: virt-manager-2.1.0/virtinst/installer.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/installer.py
-+++ virt-manager-2.0.0/virtinst/installer.py
-@@ -307,6 +307,20 @@ class Installer(object):
+--- virt-manager-2.1.0.orig/virtinst/installer.py
++++ virt-manager-2.1.0/virtinst/installer.py
+@@ -303,6 +303,20 @@ class Installer(object):
install_xml = None
if self.has_install_phase():
install_xml = self._get_install_xml(guest)
@@ -16,9 +16,9 @@
+ if guest.os.arch != 'x86_64' or os_ver.startswith("sles9") or \
+ os_ver.startswith("sles10") or os_ver.startswith("sled10") or \
+ os_ver.startswith("opensuse10") or
os_ver.startswith("opensuse11"):
-+ guest.os.bootloader = "pygrub"
++ guest.bootloader = "pygrub"
+ else:
-+ guest.os.bootloader = None
++ guest.bootloader = None
+ self._install_kernel = "/usr/lib/grub2/x86_64-xen/grub.xen"
+ self._install_initrd = None
+ self.extraargs = None
++++++ virtinst-python2-to-python3-conversion.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.577487929 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.577487929 +0100
@@ -1,8 +1,8 @@
-Index: virt-manager-2.0.0/virtinst/osdict.py
+Index: virt-manager-2.1.0/virtinst/osdict.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/osdict.py
-+++ virt-manager-2.0.0/virtinst/osdict.py
-@@ -51,7 +51,7 @@ def _sort(tosort):
+--- virt-manager-2.1.0.orig/virtinst/osdict.py
++++ virt-manager-2.1.0/virtinst/osdict.py
+@@ -50,7 +50,7 @@ def _sort(tosort):
distro_mappings = {}
retlist = []
@@ -11,11 +11,11 @@
# Libosinfo has some duplicate version numbers here, so append .1
# if there's a collision
sortby = _sortby(osinfo)
-Index: virt-manager-2.0.0/virtinst/installertreemedia.py
+Index: virt-manager-2.1.0/virtinst/installertreemedia.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/installertreemedia.py
-+++ virt-manager-2.0.0/virtinst/installertreemedia.py
-@@ -22,7 +22,7 @@ from .osdict import OSDB
+--- virt-manager-2.1.0.orig/virtinst/installertreemedia.py
++++ virt-manager-2.1.0/virtinst/installertreemedia.py
+@@ -19,7 +19,7 @@ from .osdict import OSDB
# Enum of the various install media types we can have
(MEDIA_DIR,
MEDIA_ISO,
@@ -24,11 +24,11 @@
def _is_url(url):
-Index: virt-manager-2.0.0/virtinst/xmlbuilder.py
+Index: virt-manager-2.1.0/virtinst/xmlbuilder.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/xmlbuilder.py
-+++ virt-manager-2.0.0/virtinst/xmlbuilder.py
-@@ -625,7 +625,7 @@ class XMLBuilder(object):
+--- virt-manager-2.1.0.orig/virtinst/xmlbuilder.py
++++ virt-manager-2.1.0/virtinst/xmlbuilder.py
+@@ -624,7 +624,7 @@ class XMLBuilder(object):
whenever child objects are added or removed
"""
typecount = {}
@@ -37,10 +37,10 @@
for obj in util.listify(getattr(self, propname)):
idxstr = ""
if not xmlprop.is_single:
-Index: virt-manager-2.0.0/virtinst/domcapabilities.py
+Index: virt-manager-2.1.0/virtinst/domcapabilities.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/domcapabilities.py
-+++ virt-manager-2.0.0/virtinst/domcapabilities.py
+--- virt-manager-2.1.0.orig/virtinst/domcapabilities.py
++++ virt-manager-2.1.0/virtinst/domcapabilities.py
@@ -202,7 +202,7 @@ class DomainCapabilities(XMLBuilder):
return _("BIOS")
return _("None")
@@ -50,11 +50,11 @@
for pattern in patterns:
if re.match(pattern, path):
return (_("UEFI %(arch)s: %(path)s") %
-Index: virt-manager-2.0.0/virtinst/devices/disk.py
+Index: virt-manager-2.1.0/virtinst/devices/disk.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/devices/disk.py
-+++ virt-manager-2.0.0/virtinst/devices/disk.py
-@@ -327,7 +327,7 @@ class DeviceDisk(Device):
+--- virt-manager-2.1.0.orig/virtinst/devices/disk.py
++++ virt-manager-2.1.0/virtinst/devices/disk.py
+@@ -326,7 +326,7 @@ class DeviceDisk(Device):
digit = 1
seen_valid = True
@@ -63,7 +63,7 @@
return gen_t
-@@ -918,11 +918,11 @@ class DeviceDisk(Device):
+@@ -919,11 +919,11 @@ class DeviceDisk(Device):
def get_target():
first_found = None
@@ -77,10 +77,10 @@
for i in ran:
postfix = self.num_to_target(i + 1)
-Index: virt-manager-2.0.0/virtinst/pollhelpers.py
+Index: virt-manager-2.1.0/virtinst/pollhelpers.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/pollhelpers.py
-+++ virt-manager-2.0.0/virtinst/pollhelpers.py
+--- virt-manager-2.1.0.orig/virtinst/pollhelpers.py
++++ virt-manager-2.1.0/virtinst/pollhelpers.py
@@ -131,7 +131,7 @@ def fetch_pools(backend, origmap, build_
for obj in objs:
try:
++++++ virtinst-s390x-disable-graphics.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.589487925 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.589487925 +0100
@@ -1,9 +1,9 @@
Reference: bnc#869024
Disable graphics on s390x
-Index: virt-manager-2.0.0/virtinst/guest.py
+Index: virt-manager-2.1.0/virtinst/guest.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/guest.py
-+++ virt-manager-2.0.0/virtinst/guest.py
+--- virt-manager-2.1.0.orig/virtinst/guest.py
++++ virt-manager-2.1.0/virtinst/guest.py
@@ -159,7 +159,10 @@ class Guest(XMLBuilder):
self.skip_default_channel = False
self.skip_default_sound = False
@@ -25,7 +25,7 @@
return True
return False
-@@ -592,7 +595,7 @@ class Guest(XMLBuilder):
+@@ -601,7 +604,7 @@ class Guest(XMLBuilder):
self.add_device(dev)
def _add_default_video_device(self):
@@ -34,7 +34,7 @@
return
if self.devices.video:
return
-@@ -656,7 +659,7 @@ class Guest(XMLBuilder):
+@@ -665,7 +668,7 @@ class Guest(XMLBuilder):
return
if self.os.is_container() and not self.conn.is_vz():
return
++++++ virtinst-set-cache-mode-unsafe-for-install.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.597487924 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.597487924 +0100
@@ -1,10 +1,10 @@
Set cache mode for target installation disk to unsafe for better
performance.
-Index: virt-manager-2.0.0/virtinst/installer.py
+Index: virt-manager-2.1.0/virtinst/installer.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/installer.py
-+++ virt-manager-2.0.0/virtinst/installer.py
-@@ -294,10 +294,21 @@ class Installer(object):
+--- virt-manager-2.1.0.orig/virtinst/installer.py
++++ virt-manager-2.1.0/virtinst/installer.py
+@@ -290,10 +290,21 @@ class Installer(object):
guest.os.kernel_args, guest.on_reboot) = data
def _get_install_xml(self, guest):
++++++ virtinst-use-qemu-for-cdrom-device.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.605487922 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.609487921 +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-2.0.0/virtinst/devices/disk.py
+Index: virt-manager-2.1.0/virtinst/devices/disk.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/devices/disk.py
-+++ virt-manager-2.0.0/virtinst/devices/disk.py
-@@ -435,7 +435,8 @@ class DeviceDisk(Device):
+--- virt-manager-2.1.0.orig/virtinst/devices/disk.py
++++ virt-manager-2.1.0/virtinst/devices/disk.py
+@@ -436,7 +436,8 @@ class DeviceDisk(Device):
# 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.PFB7ss/_old 2019-02-13 10:10:11.617487918 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.617487918 +0100
@@ -4,12 +4,12 @@
virtualized if the pae kernel is selected.
Note that sles12 and newer has no 32bit release.
-Index: virt-manager-2.0.0/virtinst/urldetect.py
+Index: virt-manager-2.1.0/virtinst/urldetect.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/urldetect.py
-+++ virt-manager-2.0.0/virtinst/urldetect.py
-@@ -541,9 +541,14 @@ class SuseDistro(Distro):
- self._kernel_paths = []
+--- virt-manager-2.1.0.orig/virtinst/urldetect.py
++++ virt-manager-2.1.0/virtinst/urldetect.py
+@@ -515,9 +515,14 @@ class _SuseDistro(_RHELDistro):
+
if self.type == "xen":
# Matches Opensuse > 10.2 and sles 10
- self._kernel_paths.append(
@@ -25,4 +25,4 @@
+ "boot/%s/initrd-xen" % tree_arch))
if (tree_arch == "s390x" and
- (self._os_variant == "sles11" or self._os_variant == "sled11")):
+ str(self._os_variant).startswith(("sles11", "sled11"))):
++++++ virtinst-vol-default-nocow.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.625487916 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.625487916 +0100
@@ -4,11 +4,11 @@
Signed-off-by: Chunyan Liu <cy...@suse.com>
-Index: virt-manager-2.0.0/virtinst/storage.py
+Index: virt-manager-2.1.0/virtinst/storage.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/storage.py
-+++ virt-manager-2.0.0/virtinst/storage.py
-@@ -618,6 +618,11 @@ class StorageVolume(_StorageObject):
+--- virt-manager-2.1.0.orig/virtinst/storage.py
++++ virt-manager-2.1.0/virtinst/storage.py
+@@ -617,6 +617,11 @@ class StorageVolume(_StorageObject):
return self._pool_xml.get_disk_type()
file_type = property(_get_vol_type)
@@ -20,11 +20,11 @@
##################
# XML properties #
-Index: virt-manager-2.0.0/virtinst/support.py
+Index: virt-manager-2.1.0/virtinst/support.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/support.py
-+++ virt-manager-2.0.0/virtinst/support.py
-@@ -267,6 +267,8 @@ SUPPORT_CONN_USB3_PORTS = _make(version=
+--- virt-manager-2.1.0.orig/virtinst/support.py
++++ virt-manager-2.1.0/virtinst/support.py
+@@ -266,6 +266,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", hv_version={"qemu": "2.9.0"})
SUPPORT_CONN_VNC_NONE_AUTH = _make(hv_version={"qemu": "2.9.0"})
++++++ virtinst-xen-drive-type.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.637487913 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.641487912 +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-2.0.0/virtinst/devices/disk.py
+Index: virt-manager-2.1.0/virtinst/devices/disk.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/devices/disk.py
-+++ virt-manager-2.0.0/virtinst/devices/disk.py
-@@ -453,6 +453,10 @@ class DeviceDisk(Device):
+--- virt-manager-2.1.0.orig/virtinst/devices/disk.py
++++ virt-manager-2.1.0/virtinst/devices/disk.py
+@@ -454,6 +454,10 @@ class DeviceDisk(Device):
https://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.PFB7ss/_old 2019-02-13 10:10:11.645487911 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.649487910 +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-2.0.0/virtinst/devices/disk.py
+Index: virt-manager-2.1.0/virtinst/devices/disk.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/devices/disk.py
-+++ virt-manager-2.0.0/virtinst/devices/disk.py
-@@ -900,6 +900,17 @@ class DeviceDisk(Device):
+--- virt-manager-2.1.0.orig/virtinst/devices/disk.py
++++ virt-manager-2.1.0/virtinst/devices/disk.py
+@@ -901,6 +901,17 @@ class DeviceDisk(Device):
:returns: generated target
"""
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()
-@@ -913,7 +924,12 @@ class DeviceDisk(Device):
+@@ -914,7 +925,12 @@ class DeviceDisk(Device):
ran = range(pref_ctrl * 7, (pref_ctrl + 1) * 7)
for i in ran:
++++++ virtman-default-guest-from-host-os.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.661487908 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.661487908 +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-2.0.0/virtManager/create.py
+Index: virt-manager-2.1.0/virtManager/create.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/create.py
-+++ virt-manager-2.0.0/virtManager/create.py
+--- virt-manager-2.1.0.orig/virtManager/create.py
++++ virt-manager-2.1.0/virtManager/create.py
@@ -10,6 +10,9 @@ import pkgutil
import os
import threading
@@ -14,7 +14,7 @@
from gi.repository import Gdk
from gi.repository import Gtk
-@@ -1183,6 +1186,63 @@ class vmmCreate(vmmGObjectUI):
+@@ -1184,6 +1187,63 @@ class vmmCreate(vmmGObjectUI):
def _iso_activated_cb(self, mediacombo, entry):
self._detectable_media_widget_changed(entry, checkfocus=False)
@@ -78,7 +78,7 @@
def _detect_os_toggled_cb(self, src):
if not src.is_visible():
return
-@@ -1193,6 +1253,8 @@ class vmmCreate(vmmGObjectUI):
+@@ -1194,6 +1254,8 @@ class vmmCreate(vmmGObjectUI):
if dodetect:
self._os_already_detected_for_media = False
self._start_detect_os_if_needed()
++++++ virtman-fix-env-script-interpreter.patch ++++++
--- virt-manager-2.1.0/virt-clone.orig 2019-02-04 10:40:20.390102363 -0700
+++ virt-manager-2.1.0/virt-clone 2019-02-04 10:40:41.122360052 -0700
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
#
# Copyright(c) FUJITSU Limited 2007.
#
--- virt-manager-2.1.0/virt-convert.orig 2019-02-04 10:41:50.275219728
-0700
+++ virt-manager-2.1.0/virt-convert 2019-02-04 10:41:55.563285476 -0700
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
#
# Copyright 2008, 2013, 2014 Red Hat, Inc.
#
--- virt-manager-2.1.0/virt-install.orig 2019-02-04 10:41:17.258809255
-0700
+++ virt-manager-2.1.0/virt-install 2019-02-04 10:41:22.370872807 -0700
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
#
# Copyright 2005-2014 Red Hat, Inc.
#
--- virt-manager-2.1.0/virt-manager.orig 2019-02-04 10:41:02.902630789
-0700
+++ virt-manager-2.1.0/virt-manager 2019-02-04 10:41:11.870742273 -0700
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
#
# Copyright (C) 2006, 2014 Red Hat, Inc.
# Copyright (C) 2006 Daniel P. Berrange <berra...@redhat.com>
--- virt-manager-2.1.0/virt-xml.orig 2019-02-04 10:41:32.923003992 -0700
+++ virt-manager-2.1.0/virt-xml 2019-02-04 10:41:38.803077096 -0700
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
#
# Copyright 2013-2014 Red Hat, Inc.
#
++++++ virtman-keycombo.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.689487900 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.689487900 +0100
@@ -1,22 +1,22 @@
Enhancement adding Send Keys for mostly NetWare and also Windows
-Index: virt-manager-2.0.0/virtManager/console.py
+Index: virt-manager-2.1.0/virtManager/console.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/console.py
-+++ virt-manager-2.0.0/virtManager/console.py
-@@ -204,6 +204,16 @@ class vmmConsolePages(vmmGObjectUI):
- make_item("Ctrl+Alt+_Backspace", ["Control_L", "Alt_L", "BackSpace"])
- make_item("Ctrl+Alt+_Delete", ["Control_L", "Alt_L", "Delete"])
- menu.add(Gtk.SeparatorMenuItem())
-+ make_item("Ctrl+Scroll+Scroll", ["Control_L", "Scroll" + "Scroll"])
-+ make_item("Alt+F_10", ["Alt_L", "F10"])
-+ make_item("Alt+Tab", ["Alt_L", "Tab"])
-+ make_item("Alt+Escape", ["Alt_L", "Escape"])
-+ make_item("Ctrl+Escape", ["Control_L", "Escape"])
-+ make_item("Ctrl+Alt+Escape", ["Control_L", "Alt_L", "Escape"])
-+ make_item("Alt+Shift+Shift+Escape", ["Alt_R", "Shift_R", "Shift_L",
"Escape"])
-+ make_item("F_8", ["F8"])
-+ make_item("F_10", ["F10"])
-+ menu.add(Gtk.SeparatorMenuItem())
+--- virt-manager-2.1.0.orig/virtManager/console.py
++++ virt-manager-2.1.0/virtManager/console.py
+@@ -114,6 +114,16 @@ def build_keycombo_menu(on_send_key_fn):
+ make_item("Ctrl+Alt+_Backspace", ["Control_L", "Alt_L", "BackSpace"])
+ make_item("Ctrl+Alt+_Delete", ["Control_L", "Alt_L", "Delete"])
+ menu.add(Gtk.SeparatorMenuItem())
++ make_item("Ctrl+Scroll+Scroll", ["Control_L", "Scroll" + "Scroll"])
++ make_item("Alt+F_10", ["Alt_L", "F10"])
++ make_item("Alt+Tab", ["Alt_L", "Tab"])
++ make_item("Alt+Escape", ["Alt_L", "Escape"])
++ make_item("Ctrl+Escape", ["Control_L", "Escape"])
++ make_item("Ctrl+Alt+Escape", ["Control_L", "Alt_L", "Escape"])
++ make_item("Alt+Shift+Shift+Escape", ["Alt_R", "Shift_R", "Shift_L",
"Escape"])
++ make_item("F_8", ["F8"])
++ make_item("F_10", ["F10"])
++ menu.add(Gtk.SeparatorMenuItem())
- for i in range(1, 13):
- make_item("Ctrl+Alt+F_%d" % i, ["Control_L", "Alt_L", "F%d" % i])
+ for i in range(1, 13):
+ make_item("Ctrl+Alt+F_%d" % i, ["Control_L", "Alt_L", "F%d" % i])
++++++ virtman-prevent-double-click-starting-vm-twice.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.701487897 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.701487897 +0100
@@ -3,11 +3,11 @@
virt-manager issues two start commands to start the VM which
results in a failure. There is code elsewhere to desensitize the
button but this patch does it earlier.
-Index: virt-manager-2.0.0/virtManager/details.py
+Index: virt-manager-2.1.0/virtManager/details.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/details.py
-+++ virt-manager-2.0.0/virtManager/details.py
-@@ -1489,6 +1489,9 @@ class vmmDetails(vmmGObjectUI):
+--- virt-manager-2.1.0.orig/virtManager/details.py
++++ virt-manager-2.1.0/virtManager/details.py
+@@ -1505,6 +1505,9 @@ class vmmDetails(vmmGObjectUI):
def control_vm_run(self, src_ignore):
if self.has_unapplied_changes(self.get_hw_row()):
return
++++++ virtman-python2-to-python3-conversion.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.709487895 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.709487895 +0100
@@ -1,7 +1,7 @@
-Index: virt-manager-2.0.0/virt-manager
+Index: virt-manager-2.1.0/virt-manager
===================================================================
---- virt-manager-2.0.0.orig/virt-manager
-+++ virt-manager-2.0.0/virt-manager
+--- virt-manager-2.1.0.orig/virt-manager
++++ virt-manager-2.1.0/virt-manager
@@ -66,7 +66,7 @@ def _import_gtk(leftovers):
print("gtk3 3.14.0 or later is required.")
sys.exit(1)
@@ -11,10 +11,10 @@
# This will error if Gtk wasn't correctly initialized
Gtk.Window()
else:
-Index: virt-manager-2.0.0/virtManager/network.py
+Index: virt-manager-2.1.0/virtManager/network.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/network.py
-+++ virt-manager-2.0.0/virtManager/network.py
+--- virt-manager-2.1.0.orig/virtManager/network.py
++++ virt-manager-2.1.0/virtManager/network.py
@@ -110,7 +110,7 @@ class vmmNetwork(vmmLibvirtObject):
def set_qos(self, **kwargs):
xmlobj = self._make_xmlobj_to_define()
@@ -24,10 +24,10 @@
setattr(q, key, val)
self._redefine_xmlobj(xmlobj)
-Index: virt-manager-2.0.0/virtManager/console.py
+Index: virt-manager-2.1.0/virtManager/console.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/console.py
-+++ virt-manager-2.0.0/virtManager/console.py
+--- virt-manager-2.1.0.orig/virtManager/console.py
++++ virt-manager-2.1.0/virtManager/console.py
@@ -21,7 +21,7 @@ from .viewers import SpiceViewer, VNCVie
(_CONSOLE_PAGE_UNAVAILABLE,
_CONSOLE_PAGE_AUTHENTICATE,
@@ -37,10 +37,10 @@
class _TimedRevealer(vmmGObject):
-Index: virt-manager-2.0.0/virtManager/connection.py
+Index: virt-manager-2.1.0/virtManager/connection.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/connection.py
-+++ virt-manager-2.0.0/virtManager/connection.py
+--- virt-manager-2.1.0.orig/virtManager/connection.py
++++ virt-manager-2.1.0/virtManager/connection.py
@@ -165,7 +165,7 @@ class vmmConnection(vmmGObject):
(_STATE_DISCONNECTED,
@@ -50,20 +50,20 @@
def __init__(self, uri):
self._uri = uri
-Index: virt-manager-2.0.0/virtManager/addhardware.py
+Index: virt-manager-2.1.0/virtManager/addhardware.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/addhardware.py
-+++ virt-manager-2.0.0/virtManager/addhardware.py
-@@ -41,7 +41,7 @@ from .addstorage import vmmAddStorage
- PAGE_USBREDIR,
+--- virt-manager-2.1.0.orig/virtManager/addhardware.py
++++ virt-manager-2.1.0/virtManager/addhardware.py
+@@ -43,7 +43,7 @@ from .vsockdetails import vmmVsockDetail
PAGE_TPM,
PAGE_RNG,
-- PAGE_PANIC) = range(0, 17)
-+ PAGE_PANIC) = list(range(0, 17))
+ PAGE_PANIC,
+- PAGE_VSOCK) = range(18)
++ PAGE_VSOCK) = list(range(18))
def _build_combo(combo, values, default_value=None, sort=True):
-@@ -877,7 +877,7 @@ class vmmAddHardware(vmmGObjectUI):
+@@ -889,7 +889,7 @@ class vmmAddHardware(vmmGObjectUI):
self._dev = DeviceTpm(self.conn.get_backend())
self._dev.type = devtype
@@ -72,10 +72,10 @@
make_visible = self._dev.supports_property(param_name)
uiutil.set_grid_row_visible(self.widget(widget_name + "-label"),
make_visible)
-Index: virt-manager-2.0.0/virtManager/snapshots.py
+Index: virt-manager-2.1.0/virtManager/snapshots.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/snapshots.py
-+++ virt-manager-2.0.0/virtManager/snapshots.py
+--- virt-manager-2.1.0.orig/virtManager/snapshots.py
++++ virt-manager-2.1.0/virtManager/snapshots.py
@@ -30,7 +30,7 @@ mimemap = {
@@ -85,10 +85,10 @@
if val == m and not reverse:
return e
if val == e and reverse:
-Index: virt-manager-2.0.0/virtManager/engine.py
+Index: virt-manager-2.1.0/virtManager/engine.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/engine.py
-+++ virt-manager-2.0.0/virtManager/engine.py
+--- virt-manager-2.1.0.orig/virtManager/engine.py
++++ virt-manager-2.1.0/virtManager/engine.py
@@ -21,7 +21,7 @@ from .inspection import vmmInspection
from .systray import vmmSystray
@@ -98,10 +98,10 @@
def _show_startup_error(fn):
-Index: virt-manager-2.0.0/virtManager/mediacombo.py
+Index: virt-manager-2.1.0/virtManager/mediacombo.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/mediacombo.py
-+++ virt-manager-2.0.0/virtManager/mediacombo.py
+--- virt-manager-2.1.0.orig/virtManager/mediacombo.py
++++ virt-manager-2.1.0/virtManager/mediacombo.py
@@ -22,7 +22,7 @@ class vmmMediaCombo(vmmGObjectUI):
(MEDIA_FIELD_PATH,
MEDIA_FIELD_LABEL,
@@ -111,10 +111,10 @@
def __init__(self, conn, builder, topwin):
vmmGObjectUI.__init__(self, None, None, builder=builder,
topwin=topwin)
-Index: virt-manager-2.0.0/virtManager/manager.py
+Index: virt-manager-2.1.0/virtManager/manager.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/manager.py
-+++ virt-manager-2.0.0/virtManager/manager.py
+--- virt-manager-2.1.0.orig/virtManager/manager.py
++++ virt-manager-2.1.0/virtManager/manager.py
@@ -36,7 +36,7 @@ ROW_IS_CONN_CONNECTED,
ROW_IS_VM,
ROW_IS_VM_RUNNING,
@@ -133,10 +133,10 @@
def _style_get_prop(widget, propname):
-Index: virt-manager-2.0.0/virtManager/addstorage.py
+Index: virt-manager-2.1.0/virtManager/addstorage.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/addstorage.py
-+++ virt-manager-2.0.0/virtManager/addstorage.py
+--- virt-manager-2.1.0.orig/virtManager/addstorage.py
++++ virt-manager-2.1.0/virtManager/addstorage.py
@@ -148,7 +148,7 @@ class vmmAddStorage(vmmGObjectUI):
errmsg = _("Errors were encountered changing permissions for the "
"following directories:")
@@ -146,20 +146,20 @@
if p not in broken_paths:
continue
details += "%s : %s\n" % (p, error)
-Index: virt-manager-2.0.0/virtManager/details.py
+Index: virt-manager-2.1.0/virtManager/details.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/details.py
-+++ virt-manager-2.0.0/virtManager/details.py
-@@ -101,7 +101,7 @@ from .storagebrowse import vmmStorageBro
+--- virt-manager-2.1.0.orig/virtManager/details.py
++++ virt-manager-2.1.0/virtManager/details.py
+@@ -105,7 +105,7 @@ from .vsockdetails import vmmVsockDetail
EDIT_FS,
-- EDIT_HOSTDEV_ROMBAR) = range(1, 56)
-+ EDIT_HOSTDEV_ROMBAR) = list(range(1, 56))
+- EDIT_HOSTDEV_ROMBAR) = range(1, 58)
++ EDIT_HOSTDEV_ROMBAR) = list(range(1, 58))
# Columns in hw list model
-@@ -109,7 +109,7 @@ from .storagebrowse import vmmStorageBro
+@@ -113,7 +113,7 @@ from .vsockdetails import vmmVsockDetail
HW_LIST_COL_ICON_NAME,
HW_LIST_COL_ICON_SIZE,
HW_LIST_COL_TYPE,
@@ -168,16 +168,16 @@
# Types for the hw list model: numbers specify what order they will be listed
(HW_LIST_TYPE_GENERAL,
-@@ -133,7 +133,7 @@ from .storagebrowse import vmmStorageBro
- HW_LIST_TYPE_REDIRDEV,
+@@ -138,7 +138,7 @@ from .vsockdetails import vmmVsockDetail
HW_LIST_TYPE_TPM,
HW_LIST_TYPE_RNG,
-- HW_LIST_TYPE_PANIC) = range(22)
-+ HW_LIST_TYPE_PANIC) = list(range(22))
+ HW_LIST_TYPE_PANIC,
+- HW_LIST_TYPE_VSOCK) = range(23)
++ HW_LIST_TYPE_VSOCK) = list(range(23))
remove_pages = [HW_LIST_TYPE_NIC, HW_LIST_TYPE_INPUT,
HW_LIST_TYPE_GRAPHICS, HW_LIST_TYPE_SOUND, HW_LIST_TYPE_CHAR,
-@@ -148,12 +148,12 @@ remove_pages = [HW_LIST_TYPE_NIC, HW_LIS
+@@ -153,12 +153,12 @@ remove_pages = [HW_LIST_TYPE_NIC, HW_LIS
BOOT_LABEL,
BOOT_ICON,
BOOT_ACTIVE,
@@ -192,10 +192,10 @@
-Index: virt-manager-2.0.0/virtManager/create.py
+Index: virt-manager-2.1.0/virtManager/create.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/create.py
-+++ virt-manager-2.0.0/virtManager/create.py
+--- virt-manager-2.1.0.orig/virtManager/create.py
++++ virt-manager-2.1.0/virtManager/create.py
@@ -43,7 +43,7 @@ DEFAULT_MEM = 1024
PAGE_INSTALL,
PAGE_MEM,
@@ -221,7 +221,7 @@
#####################
-@@ -2153,7 +2153,7 @@ class vmmCreate(vmmGObjectUI):
+@@ -2156,7 +2156,7 @@ class vmmCreate(vmmGObjectUI):
'insecure': self._get_config_oscontainer_isecure,
'root_password': self._get_config_oscontainer_root_password,
}
@@ -230,10 +230,10 @@
bootstrap_args[key] = getter()
parentobj = self._customize_window or self
-Index: virt-manager-2.0.0/virtManager/preferences.py
+Index: virt-manager-2.1.0/virtManager/preferences.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/preferences.py
-+++ virt-manager-2.0.0/virtManager/preferences.py
+--- virt-manager-2.1.0.orig/virtManager/preferences.py
++++ virt-manager-2.1.0/virtManager/preferences.py
@@ -127,7 +127,7 @@ class vmmPreferences(vmmGObjectUI):
}
model.append([-1, _("System default (%s)") %
@@ -243,10 +243,10 @@
model.append([key, val])
combo.set_model(model)
uiutil.init_combo_text_column(combo, 1)
-Index: virt-manager-2.0.0/virtManager/migrate.py
+Index: virt-manager-2.1.0/virtManager/migrate.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/migrate.py
-+++ virt-manager-2.0.0/virtManager/migrate.py
+--- virt-manager-2.1.0.orig/virtManager/migrate.py
++++ virt-manager-2.1.0/virtManager/migrate.py
@@ -23,7 +23,7 @@ from .domain import vmmDomain
NUM_COLS = 3
(COL_LABEL,
@@ -256,10 +256,10 @@
class vmmMigrateDialog(vmmGObjectUI):
-Index: virt-manager-2.0.0/virtManager/storagelist.py
+Index: virt-manager-2.1.0/virtManager/storagelist.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/storagelist.py
-+++ virt-manager-2.0.0/virtManager/storagelist.py
+--- virt-manager-2.1.0.orig/virtManager/storagelist.py
++++ virt-manager-2.1.0/virtManager/storagelist.py
@@ -30,13 +30,13 @@ VOL_NUM_COLUMNS = 7
VOL_COLUMN_SIZESTR,
VOL_COLUMN_FORMAT,
@@ -276,10 +276,10 @@
ICON_RUNNING = "state_running"
ICON_SHUTOFF = "state_shutoff"
-Index: virt-manager-2.0.0/virtManager/createnet.py
+Index: virt-manager-2.1.0/virtManager/createnet.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/createnet.py
-+++ virt-manager-2.0.0/virtManager/createnet.py
+--- virt-manager-2.1.0.orig/virtManager/createnet.py
++++ virt-manager-2.1.0/virtManager/createnet.py
@@ -20,7 +20,7 @@ from .baseclass import vmmGObjectUI
(PAGE_NAME,
PAGE_IPV4,
++++++ virtman-register-delete-event-for-details-dialog.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.717487893 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.717487893 +0100
@@ -6,11 +6,11 @@
need to set the connection event. Not getting the event to cleanup leaves us
in a
bad state for when the details dialog is reopened.
-Index: virt-manager-2.0.0/virtManager/details.py
+Index: virt-manager-2.1.0/virtManager/details.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/details.py
-+++ virt-manager-2.0.0/virtManager/details.py
-@@ -621,6 +621,9 @@ class vmmDetails(vmmGObjectUI):
+--- virt-manager-2.1.0.orig/virtManager/details.py
++++ virt-manager-2.1.0/virtManager/details.py
+@@ -635,6 +635,9 @@ class vmmDetails(vmmGObjectUI):
self.console.details_auth_login),
})
++++++ virtman-show-suse-install-repos.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.725487891 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.725487891 +0100
@@ -1,10 +1,10 @@
Enhancement that gets installation repos from zypper.
These locations are then presented as potential installation
sources when creating a VM.
-Index: virt-manager-2.0.0/virtManager/create.py
+Index: virt-manager-2.1.0/virtManager/create.py
===================================================================
---- virt-manager-2.0.0.orig/virtManager/create.py
-+++ virt-manager-2.0.0/virtManager/create.py
+--- virt-manager-2.1.0.orig/virtManager/create.py
++++ virt-manager-2.1.0/virtManager/create.py
@@ -371,7 +371,13 @@ class vmmCreate(vmmGObjectUI):
self.widget("install-url-entry").set_text("")
self.widget("install-url-options").set_expanded(False)
@@ -20,11 +20,11 @@
# Install import
self.widget("install-import-entry").set_text("")
-Index: virt-manager-2.0.0/virtinst/util.py
+Index: virt-manager-2.1.0/virtinst/util.py
===================================================================
---- virt-manager-2.0.0.orig/virtinst/util.py
-+++ virt-manager-2.0.0/virtinst/util.py
-@@ -11,9 +11,12 @@ import os
+--- virt-manager-2.1.0.orig/virtinst/util.py
++++ virt-manager-2.1.0/virtinst/util.py
+@@ -10,9 +10,12 @@ import os
import random
import re
import sys
@@ -37,7 +37,7 @@
def listify(l):
if l is None:
-@@ -292,3 +295,57 @@ def make_meter(quiet):
+@@ -291,3 +294,57 @@ def make_meter(quiet):
if quiet:
return progress.BaseMeter()
return progress.TextMeter(fo=sys.stdout)
++++++ virttests-python2-to-python3-conversion.patch ++++++
--- /var/tmp/diff_new_pack.PFB7ss/_old 2019-02-13 10:10:11.733487889 +0100
+++ /var/tmp/diff_new_pack.PFB7ss/_new 2019-02-13 10:10:11.733487889 +0100
@@ -1,8 +1,8 @@
-Index: virt-manager-2.0.0/tests/clitest.py
+Index: virt-manager-2.1.0/tests/clitest.py
===================================================================
---- virt-manager-2.0.0.orig/tests/clitest.py
-+++ virt-manager-2.0.0/tests/clitest.py
-@@ -176,7 +176,7 @@ class Command(object):
+--- virt-manager-2.1.0.orig/tests/clitest.py
++++ virt-manager-2.1.0/tests/clitest.py
+@@ -204,7 +204,7 @@ class Command(object):
try:
conn = None
@@ -11,10 +11,10 @@
if self.argv[idx] == "--connect":
conn = utils.URIs.openconn(self.argv[idx + 1])
break
-Index: virt-manager-2.0.0/tests/test_inject.py
+Index: virt-manager-2.1.0/tests/test_inject.py
===================================================================
---- virt-manager-2.0.0.orig/tests/test_inject.py
-+++ virt-manager-2.0.0/tests/test_inject.py
+--- virt-manager-2.1.0.orig/tests/test_inject.py
++++ virt-manager-2.1.0/tests/test_inject.py
@@ -15,7 +15,7 @@ FEDORA_URL = "http://dl.fedoraproject.or
(WARN_RHEL5,
