674d49879e
virt-manager-2.0.0.tar.bz2 * Finish port to Python 3 (Radostin Stoyanov, Cole Robinson) * Improved VM defaults for supported OS: q35 PCIe, usb3, CPU host-model * Search based OS selection UI for new VMs (Daniel P. Berrangé, Cole Robinson) * Track OS name for lifetime of domain in XML * Host interface management UI has been completely removed * Show domain IP on interface details page (Lin Ma, Cole Robinson) * More efficient stats polling with AllDomainStats (Simon Kobyda, Cole Robinson) * TPM device model and backend UI (Marc-André Lureau, Stefan Berger) * Show connection state in UI (Lin Ma) * Show attached devices in UI (Lin Ma) * UI option to plug/unplug VM nic link (Simon Kobyda) * UI support for disk discard and detect_zeroes (Povilas Kanapickas, Lin Ma) * Improved SUSE –location URL/ISO detection (Charles Arnold) * cli and UI support for SCSI persistent reservations (Lin Ma) * cli: Add –network mtu.size= option (Anya Harter) * cli: Add –disk driver.copy_on_read (Anya Harter) * cli: Add –disk geometry support (Anya Harter) * cli: Add –sound codec support (Anya Harter) * cli: Add –hostdev net/char/block for LXC (Lubomir Rintel) * cli: Add –memorybacking access_mode and source_type (Marc-André Lureau) * cli: Add –boot rebootTimout (Yossi Ovadia) * cli: Add –boot bootloader= * cli: Add –destroy-on-exit - Drop patches contained in new tarball or not required 0004-virtinst-python3-use-binary-mode-for-kernel.patch 27d4b167-virtinst-update-location-for-opensuse.patch 5a7698c7-fix-select-network-vol.patch d15b78ab-virtinst-read-CPU-model-from-domain-capabilities.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=437
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.0.0/virtinst/progress.py
|
|
===================================================================
|
|
--- virt-manager-2.0.0.orig/virtinst/progress.py
|
|
+++ virt-manager-2.0.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
|
|
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'
|