Hello community,
here is the log from the commit of package virt-manager for openSUSE:Factory
checked in at 2017-12-05 01:30:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virt-manager (Old)
and /work/SRC/openSUSE:Factory/.virt-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-manager"
Tue Dec 5 01:30:42 2017 rev:161 rq:548109 version:1.4.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes
2017-11-30 12:45:19.546061905 +0100
+++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes
2017-12-05 01:30:43.420240141 +0100
@@ -1,0 +2,11 @@
+Sat Dec 2 18:41:22 MST 2017 - carn...@suse.com
+
+- bsc#1070896 - virt-manager will not run on a python3 only system
+ virtcli-python2-to-python3-conversion.patch
+ virtconv-python2-to-python3-conversion.patch
+ virtinst-python2-to-python3-conversion.patch
+ virtman-python2-to-python3-conversion.patch
+ virtmisc-python2-to-python3-conversion.patch
+ virttests-python2-to-python3-conversion.patch
+
+-------------------------------------------------------------------
New:
----
virtcli-python2-to-python3-conversion.patch
virtconv-python2-to-python3-conversion.patch
virtinst-python2-to-python3-conversion.patch
virtman-python2-to-python3-conversion.patch
virtmisc-python2-to-python3-conversion.patch
virttests-python2-to-python3-conversion.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virt-manager.spec ++++++
--- /var/tmp/diff_new_pack.8rJTWU/_old 2017-12-05 01:30:47.300099191 +0100
+++ /var/tmp/diff_new_pack.8rJTWU/_new 2017-12-05 01:30:47.304099046 +0100
@@ -115,6 +115,13 @@
Patch167: virtinst-no-usb-tablet-for-xenpv.patch
Patch168: virtinst-add-sle15-detection-support.patch
Patch169: virtinst-keep-install-iso-attached.patch
+# Python2 to Python3 patches
+Patch200: virtmisc-python2-to-python3-conversion.patch
+Patch201: virtcli-python2-to-python3-conversion.patch
+Patch202: virtconv-python2-to-python3-conversion.patch
+Patch203: virtinst-python2-to-python3-conversion.patch
+Patch204: virtman-python2-to-python3-conversion.patch
+Patch205: virttests-python2-to-python3-conversion.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -123,10 +130,10 @@
Requires: dconf
Requires: gtk3
Requires: python-gconf
-Requires: python-gobject-Gdk
+Requires: python3-gobject-Gdk
# For console widget
-Requires: python-gobject-cairo
-Recommends: python-SpiceClientGtk
+Requires: python3-gobject-cairo
+Recommends: python3-SpiceClientGtk
Requires: virt-install
Requires: virt-manager-common = %{verrel}
%if 0%{?is_opensuse} == 1
@@ -135,14 +142,14 @@
%endif
%if %{with_guestfs}
-Requires: python-libguestfs
+Requires: python3-libguestfs
%endif
BuildRequires: glib2-devel
BuildRequires: gtk2-tools
BuildRequires: intltool
BuildRequires: perl
-BuildRequires: python
+BuildRequires: python3
%description
Virtual Machine Manager provides a graphical tool for administering virtual
@@ -159,10 +166,10 @@
# This version not strictly required: virt-manager should work with older,
# however varying amounts of functionality will not be enabled.
Requires: libosinfo >= 0.2.10
-Requires: python-ipaddr
-Requires: python-libvirt-python >= 0.7.0
-Requires: python-libxml2
-Requires: python-urlgrabber
+Requires: python3-ipaddr
+Requires: python3-libvirt-python >= 0.7.0
+Requires: python3-libxml2-python
+Requires: python3-pycurl
Requires: typelib(LibvirtGLib)
Recommends: python3-virt-bootstrap
BuildRequires: gobject-introspection
@@ -182,8 +189,8 @@
Requires: virt-manager-common = %{verrel}
-Requires: python-requests
-Provides: python-virtinst
+Requires: python3-requests
+Provides: python3-virtinst
Provides: virt-clone
Provides: virt-convert
Obsoletes: python-virtinst <= 0.600.4
@@ -275,6 +282,13 @@
%patch167 -p1
%patch168 -p1
%patch169 -p1
+# Python2 to Python3 patches
+%patch200 -p1
+%patch201 -p1
+%patch202 -p1
+%patch203 -p1
+%patch204 -p1
+%patch205 -p1
%build
%if %{qemu_user}
@@ -301,7 +315,7 @@
%define _askpass_package --askpass-package-names=%{askpass_package}
%endif
-python setup.py configure \
+python3 setup.py configure \
--prefix=%{_prefix} \
--default-graphics="spice" \
%{?_qemu_user} \
@@ -313,7 +327,7 @@
%{?_default_graphics}
%install
-python setup.py \
+python3 setup.py \
--no-update-icon-cache \
--no-compile-schemas install \
--prefix=%{_prefix} \
++++++ virtcli-python2-to-python3-conversion.patch ++++++
Index: virt-manager-1.4.3/virtcli/cliconfig.py
===================================================================
--- virt-manager-1.4.3.orig/virtcli/cliconfig.py
+++ virt-manager-1.4.3/virtcli/cliconfig.py
@@ -21,11 +21,11 @@
Configuration variables that can be set at build time
"""
-import ConfigParser
+import configparser
import os
-_cfg = ConfigParser.ConfigParser()
+_cfg = configparser.ConfigParser()
_filepath = os.path.abspath(__file__)
_srcdir = os.path.abspath(os.path.join(os.path.dirname(_filepath), ".."))
_cfgpath = os.path.join(os.path.dirname(_filepath), "cli.cfg")
@@ -46,7 +46,7 @@ def _get_param(name, default):
return default
try:
return _cfg.get("config", name)
- except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
+ except (configparser.NoOptionError, configparser.NoSectionError):
return default
++++++ virtconv-python2-to-python3-conversion.patch ++++++
Index: virt-manager-1.4.3/virt-convert
===================================================================
--- virt-manager-1.4.3.orig/virt-convert
+++ virt-manager-1.4.3/virt-convert
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python3
#
# Copyright 2008, 2013, 2014 Red Hat, Inc.
# Joey Boggs <jbo...@redhat.com>
Index: virt-manager-1.4.3/virtconv/vmx.py
===================================================================
--- virt-manager-1.4.3.orig/virtconv/vmx.py
+++ virt-manager-1.4.3/virtconv/vmx.py
@@ -271,7 +271,7 @@ class vmx_parser(parser_class):
def _find_keys(prefixes):
ret = []
- for key, value in config.items():
+ for key, value in list(config.items()):
for p in util.listify(prefixes):
if key.startswith(p):
ret.append((key, value))
Index: virt-manager-1.4.3/virtconv/ovf.py
===================================================================
--- virt-manager-1.4.3.orig/virtconv/ovf.py
+++ virt-manager-1.4.3/virtconv/ovf.py
@@ -90,7 +90,7 @@ def node_list(node):
child = node.children
while child:
child_list.append(child)
- child = child.next
+ child = child.__next__
return child_list
Index: virt-manager-1.4.3/virtconv/formats.py
===================================================================
--- virt-manager-1.4.3.orig/virtconv/formats.py
+++ virt-manager-1.4.3/virtconv/formats.py
@@ -19,7 +19,7 @@
# MA 02110-1301 USA.
#
-from __future__ import print_function
+
from distutils.spawn import find_executable
import logging
++++++ virtinst-python2-to-python3-conversion.patch ++++++
++++ 620 lines (skipped)
++++++ virtman-python2-to-python3-conversion.patch ++++++
++++ 809 lines (skipped)
++++++ virtmisc-python2-to-python3-conversion.patch ++++++
Index: virt-manager-1.4.3/virt-clone
===================================================================
--- virt-manager-1.4.3.orig/virt-clone
+++ virt-manager-1.4.3/virt-clone
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python3
#
# Copyright(c) FUJITSU Limited 2007.
#
Index: virt-manager-1.4.3/virt-xml
===================================================================
--- virt-manager-1.4.3.orig/virt-xml
+++ virt-manager-1.4.3/virt-xml
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python3
#
# Copyright 2013-2014 Red Hat, Inc.
# Cole Robinson <crobi...@redhat.com>
++++++ virttests-python2-to-python3-conversion.patch ++++++
Index: virt-manager-1.4.3/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):
try:
conn = None
- for idx in reversed(range(len(self.argv))):
+ for idx in reversed(list(range(len(self.argv)))):
if self.argv[idx] == "--connect":
conn = utils.openconn(self.argv[idx + 1])
break
Index: virt-manager-1.4.3/tests/uitests/utils.py
===================================================================
--- virt-manager-1.4.3.orig/tests/uitests/utils.py
+++ virt-manager-1.4.3/tests/uitests/utils.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+
import os
import re
Index: virt-manager-1.4.3/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):
conn.fetch_all_nodedevs()
_conn_cache[uri] = {}
- for key, value in conn._fetch_cache.items():
+ for key, value in list(conn._fetch_cache.items()):
_conn_cache[uri][key] = value[:]
# Prime the internal connection cache
- for key, value in _conn_cache[uri].items():
+ for key, value in list(_conn_cache[uri].items()):
conn._fetch_cache[key] = value[:]
def cb_cache_new_pool(poolobj):
Index: virt-manager-1.4.3/tests/test_inject.py
===================================================================
--- virt-manager-1.4.3.orig/tests/test_inject.py
+++ virt-manager-1.4.3/tests/test_inject.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python2
# Copyright (C) 2013, 2014 Red Hat, Inc.
-from __future__ import print_function
+
import atexit
import os
@@ -29,7 +29,7 @@ FEDORA_URL = "http://dl.fedoraproject.or
(WARN_RHEL4,
WARN_RHEL5,
- WARN_LATEST) = range(1, 4)
+ WARN_LATEST) = list(range(1, 4))
def prompt():
@@ -185,7 +185,7 @@ def _make_tests():
return lambda s: _test_distro(_d)
idx = 0
- for dname, dobj in _alldistros.items():
+ for dname, dobj in list(_alldistros.items()):
idx += 1
setattr(FetchTests, "testFetch%.3d_%s" %
(idx, dname.replace("-", "_")), _make_fetch_cb(dobj))
Index: virt-manager-1.4.3/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
- 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
===================================================================
--- virt-manager-1.4.3.orig/tests/virtconvtest.py
+++ virt-manager-1.4.3/tests/virtconvtest.py
@@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301 USA.
-from __future__ import print_function
+
import glob
import io
Index: virt-manager-1.4.3/tests/nodedev.py
===================================================================
--- virt-manager-1.4.3.orig/tests/nodedev.py
+++ virt-manager-1.4.3/tests/nodedev.py
@@ -69,7 +69,7 @@ class TestNodeDev(unittest.TestCase):
def _testCompare(self, devname, vals, devxml=None):
def _compare(dev, vals, root=""):
- for attr in vals.keys():
+ for attr in list(vals.keys()):
expect = vals[attr]
actual = getattr(dev, attr)
if isinstance(expect, list):
