8d6890f068
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 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=456
93 lines
3.7 KiB
Diff
93 lines
3.7 KiB
Diff
Index: virt-manager-2.1.0/virtinst/osdict.py
|
|
===================================================================
|
|
--- 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 = []
|
|
|
|
- for key, osinfo in tosort.items():
|
|
+ for key, osinfo in list(tosort.items()):
|
|
# Libosinfo has some duplicate version numbers here, so append .1
|
|
# if there's a collision
|
|
sortby = _sortby(osinfo)
|
|
Index: virt-manager-2.1.0/virtinst/installertreemedia.py
|
|
===================================================================
|
|
--- 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,
|
|
- MEDIA_URL) = range(1, 4)
|
|
+ MEDIA_URL) = list(range(1, 4))
|
|
|
|
|
|
def _is_url(url):
|
|
Index: virt-manager-2.1.0/virtinst/xmlbuilder.py
|
|
===================================================================
|
|
--- 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 = {}
|
|
- for propname, xmlprop in self._all_child_props().items():
|
|
+ for propname, xmlprop in list(self._all_child_props().items()):
|
|
for obj in util.listify(getattr(self, propname)):
|
|
idxstr = ""
|
|
if not xmlprop.is_single:
|
|
Index: virt-manager-2.1.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")
|
|
|
|
- for arch, patterns in self._uefi_arch_patterns.items():
|
|
+ for arch, patterns in list(self._uefi_arch_patterns.items()):
|
|
for pattern in patterns:
|
|
if re.match(pattern, path):
|
|
return (_("UEFI %(arch)s: %(path)s") %
|
|
Index: virt-manager-2.1.0/virtinst/devices/disk.py
|
|
===================================================================
|
|
--- 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
|
|
- gen_t += "%c" % (ord('a') + digit - 1)
|
|
+ gen_t += "%c" % int(ord('a') + digit - 1)
|
|
|
|
return gen_t
|
|
|
|
@@ -919,11 +919,11 @@ class DeviceDisk(Device):
|
|
def get_target():
|
|
first_found = None
|
|
|
|
- ran = range(maxnode)
|
|
+ ran = list(range(maxnode))
|
|
if pref_ctrl is not None:
|
|
# We assume narrow SCSI bus and libvirt assigning 7
|
|
# (1-7, 8-14, etc.) devices per controller
|
|
- ran = range(pref_ctrl * 7, (pref_ctrl + 1) * 7)
|
|
+ ran = list(range(pref_ctrl * 7, (pref_ctrl + 1) * 7))
|
|
|
|
for i in ran:
|
|
postfix = self.num_to_target(i + 1)
|
|
Index: virt-manager-2.1.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:
|
|
obj.refresh(0)
|
|
- except Exception, e:
|
|
+ except Exception as e:
|
|
pass
|
|
|
|
return _new_poll_helper(origmap, name,
|