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
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From 955c4f03d623461c4e06d9f39eea7ac305104b0a Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Thu, 7 Dec 2017 11:21:21 +0100
|
|
Subject: [PATCH 3/4] virtinst: python3: avoid using long type
|
|
|
|
Avoids the following error:
|
|
|
|
File "/usr/share/virt-manager/virtinst/progress.py", line 484, in format_number
|
|
if isinstance(number, int) or isinstance(number, long):
|
|
NameError: name 'long' is not defined
|
|
---
|
|
virtinst/progress.py | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
Index: virt-manager-2.1.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
|
|
@@ -506,7 +507,7 @@ def format_number(number, SI=0, space='
|
|
depth = depth + 1
|
|
number = number / step
|
|
|
|
- if isinstance(number, int):
|
|
+ if isinstance(number, integer_types):
|
|
# 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'
|