Hello community,
here is the log from the commit of package vm-install for openSUSE:Factory
checked in at 2018-02-09 15:46:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vm-install (Old)
and /work/SRC/openSUSE:Factory/.vm-install.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vm-install"
Fri Feb 9 15:46:37 2018 rev:163 rq:573911 version:0.10.02
Changes:
--------
--- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2018-01-28
20:33:36.182386086 +0100
+++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes
2018-02-09 15:46:39.533302630 +0100
@@ -1,0 +2,9 @@
+Mon Jan 29 15:02:25 MST 2018 - carn...@suse.com
+
+- A few miscellaneous python3 and Gtk3 fixes to GUI components.
+ bsc#1047602
+- Mount does not work for reiserfs on SLE15. Default to kernel-xen
+ and initrd-xen if the guest is sles10.
+- Version 0.10.02
+
+-------------------------------------------------------------------
Old:
----
vm-install-0.10.01.tar.bz2
New:
----
vm-install-0.10.02.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vm-install.spec ++++++
--- /var/tmp/diff_new_pack.gPNO97/_old 2018-02-09 15:46:40.145280655 +0100
+++ /var/tmp/diff_new_pack.gPNO97/_new 2018-02-09 15:46:40.145280655 +0100
@@ -27,12 +27,12 @@
%endif
# For directory ownership:
BuildRequires: yast2
-Version: 0.10.01
+Version: 0.10.02
Release: 0
Summary: Tool to Define a Virtual Machine and Install Its Operating
System
License: GPL-2.0
Group: System/Emulators/PC
-Source0: %{name}-0.10.01.tar.bz2
+Source0: %{name}-0.10.02.tar.bz2
Source1: vm-install.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: kdump
++++++ vm-install-0.10.01.tar.bz2 -> vm-install-0.10.02.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.10.01/Makefile
new/vm-install-0.10.02/Makefile
--- old/vm-install-0.10.01/Makefile 2018-01-26 23:43:47.208724753 +0100
+++ new/vm-install-0.10.02/Makefile 2018-01-30 17:22:39.150401330 +0100
@@ -1,5 +1,5 @@
PACKAGE = vm-install
-VER = 0.10.01
+VER = 0.10.02
default:
@echo "Run 'make install DESTDIR=$destdir' to install."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.10.01/glade/vmm-create.xml
new/vm-install-0.10.02/glade/vmm-create.xml
--- old/vm-install-0.10.01/glade/vmm-create.xml 2018-01-23 15:48:33.271312545
+0100
+++ new/vm-install-0.10.02/glade/vmm-create.xml 2018-02-02 00:13:13.701734770
+0100
@@ -1402,18 +1402,18 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox37">
+ <object class="GtkBox" id="hbox37">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkAlignment" id="alignment106">
+ <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="yalign">0.10000000149011612</property>
<property
name="yscale">0.10000000149011612</property>
<property name="left_padding">5</property>
<child>
- <object class="GtkImage" id="image88">
+ <object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0.5</property>
@@ -1431,7 +1431,7 @@
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment107">
+ <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">3</property>
@@ -1445,7 +1445,7 @@
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
- <property name="yalign">0.5</property>
+ <property name="yalign">0.1</property>
</object>
</child>
</object>
@@ -1460,8 +1460,6 @@
<property name="right_attach">2</property>
<property name="top_attach">8</property>
<property name="bottom_attach">9</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -2213,12 +2211,6 @@
<object class="GtkComboBoxText"
id="graphics-hw-screen-resolution-combobox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkCellRendererText"
id="renderer1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -2316,12 +2308,6 @@
<object class="GtkComboBoxText"
id="keymap-combobox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkCellRendererText"
id="renderer2"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -2419,12 +2405,6 @@
<object class="GtkComboBoxText"
id="sound-combobox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkCellRendererText"
id="renderer3"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
</object>
<packing>
<property name="left_attach">1</property>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.10.01/setup.py
new/vm-install-0.10.02/setup.py
--- old/vm-install-0.10.01/setup.py 2018-01-26 23:43:43.004669047 +0100
+++ new/vm-install-0.10.02/setup.py 2018-01-30 17:22:39.006406893 +0100
@@ -1,7 +1,7 @@
from distutils.core import setup
setup(name='vminstall',
- version='0.10.01',
+ version='0.10.02',
description='Define a virtual machine and install its operating system',
author='Charles Coffing',
author_email='ccoff...@novell.com',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.10.01/src/vmdisks/disks.py
new/vm-install-0.10.02/src/vmdisks/disks.py
--- old/vm-install-0.10.01/src/vmdisks/disks.py 2018-01-26 22:43:44.652988574
+0100
+++ new/vm-install-0.10.02/src/vmdisks/disks.py 2018-02-07 22:23:32.049456165
+0100
@@ -115,7 +115,7 @@
def create_with_qemu(type, filename, bytes, arg={}, progress=lambda f:None):
log.debug("Creating qcow file '%s', %d bytes." % (filename, bytes))
- mb = str(bytes / 1024 / 1024) + 'M'
+ mb = str(bytes // 1024 // 1024) + 'M'
fmt = '-f' + type
fd = os.open(filename, os.O_WRONLY | os.O_CREAT | os.O_TRUNC |
os.O_LARGEFILE | os.O_DIRECT);
if os.geteuid() == 0:
@@ -138,7 +138,7 @@
def create_with_vhd_util(filename, bytes, arg={}, progress=lambda f:None):
log.debug("Creating vhd file '%s', %d bytes." % (filename, bytes))
- mb = '-s ' + str(bytes / 1024 / 1024)
+ mb = '-s ' + str(bytes // 1024 // 1024)
if not os.path.exists('/usr/sbin/vhd-util'):
raise DiskResourceError(DiskResourceError.E_CREATE_FAILED,
details='vhd-util not found')
try:
@@ -235,7 +235,7 @@
try:
f = open(path)
f.seek(0, 2) # seek to end
- return f.tell() / 512
+ return f.tell() // 512
except:
return None
def is_local(self):
@@ -252,7 +252,7 @@
# FIXME: kill this:
# Treat 0-byte files as not existing (to allow use of mkstemp
before
# ever even creating a disk object, to avoid security races)
- return stats.st_size / 512 or None
+ return stats.st_size // 512 or None
except:
return None
def size(self, path):
@@ -318,7 +318,7 @@
os.close(fd)
if len(buf) == 32:
data = struct.unpack('>IIQIIQ', buf)
- blocks = data[-1] / 512
+ blocks = data[-1] // 512
return blocks
return None
def is_local(self):
@@ -341,12 +341,12 @@
os.close(fd)
if len(buf) == 32:
data = struct.unpack('>IIQIIQ', buf)
- blocks = data[-1] / 512
+ blocks = data[-1] // 512
return blocks
else:
try:
stats = os.stat(path)
- return stats.st_size / 512 or None
+ return stats.st_size // 512 or None
except:
return None
return None
@@ -526,7 +526,7 @@
if path is not None and os.path.exists(path):
try:
stats = os.stat(path)
- blocks = stats.st_size / 512
+ blocks = stats.st_size // 512
except:
pass
@@ -1312,7 +1312,7 @@
if s.endswith('M'):
space_on_device = s.rstrip('M')
if space_on_device:
- return (int(space_on_device) * (1024 * 1024)) / 512
+ return (int(space_on_device) * (1024 * 1024)) // 512
return -1
except:
return -1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.10.01/src/vminstall/ParaVirtGuest.py
new/vm-install-0.10.02/src/vminstall/ParaVirtGuest.py
--- old/vm-install-0.10.01/src/vminstall/ParaVirtGuest.py 2018-01-24
23:30:16.369456863 +0100
+++ new/vm-install-0.10.02/src/vminstall/ParaVirtGuest.py 2018-01-30
17:22:39.090403647 +0100
@@ -290,6 +290,10 @@
else:
vpart = traildigits(partition['name'])
return (vpart, _kernel, _initrd)
+ if 'reiserfs' in str(e) and self.options.os_type in ['sles10',
'sled10']:
+ log.debug("Mount failed because of unsupported reiserfs
file system.")
+ # Mount on SLE15 stopped working for reiserfs
+ return ("xvda2", "kernel-xen", "initrd-xen")
continue
try:
(_kernel, _initrd) =
actions.getRuntimeImagesFromPath(mountpoint, self.options.os_type)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.10.01/src/vminstall/caps.py
new/vm-install-0.10.02/src/vminstall/caps.py
--- old/vm-install-0.10.01/src/vminstall/caps.py 2018-01-23
23:42:52.552416312 +0100
+++ new/vm-install-0.10.02/src/vminstall/caps.py 2018-02-07
22:19:04.715736468 +0100
@@ -60,7 +60,7 @@
except:
continue
memory = int(memory.strip())
- domu_memory = domu_memory + (memory / int(1024))
+ domu_memory = domu_memory + (memory // int(1024))
return domu_memory
def _get_xen_mem_info(cmd):
@@ -95,7 +95,7 @@
mem = line.split(':', 1)[1]
mem = mem.strip()
mem = mem.split(' ')[0]
- free_memory = free_memory + ((int)(mem) / 1024)
+ free_memory = free_memory + ((int)(mem) // 1024)
if free_memory > 512:
free_memory = free_memory - int(512)
else:
@@ -291,4 +291,4 @@
return 'sles15'
if line.startswith('SUSE Linux Enterprise Desktop 15'):
return 'sled15'
- return 'sles12'
+ return 'sles15'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.10.01/src/vminstall/gtk/interface.py
new/vm-install-0.10.02/src/vminstall/gtk/interface.py
--- old/vm-install-0.10.01/src/vminstall/gtk/interface.py 2018-01-26
23:35:41.066283053 +0100
+++ new/vm-install-0.10.02/src/vminstall/gtk/interface.py 2018-02-07
22:19:13.103413935 +0100
@@ -1289,7 +1289,7 @@
text_widget.set_sensitive(True)
else:
text_widget.set_sensitive(False)
- if self.defaults.source:
+ if self.defaults.source and isinstance(self.defaults.source, str):
self.window.get_object('upgrade-network-url-text').set_text(self.defaults.source)
#
# Page: Advanced
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.10.01/src/vminstall/options.py
new/vm-install-0.10.02/src/vminstall/options.py
--- old/vm-install-0.10.01/src/vminstall/options.py 2018-01-23
15:48:32.979308675 +0100
+++ new/vm-install-0.10.02/src/vminstall/options.py 2018-02-07
22:19:08.299598664 +0100
@@ -378,11 +378,11 @@
startup_mem = free_mem
while True:
max_avail = (free_mem - startup_mem) + 2
- max_allowed = (max_avail / 2) * 128
+ max_allowed = (max_avail // 2) * 128
if maximum_mem < max_allowed:
- overhead = (maximum_mem / 128) * 2
+ overhead = (maximum_mem // 128) * 2
else:
- overhead = (max_allowed / 128) * 2
+ overhead = (max_allowed // 128) * 2
if overhead < free_mem:
init_allowed = free_mem - overhead
else:
@@ -393,7 +393,7 @@
else:
init_allowed = hypervisor_info['max_para_memory']
if startup_mem < 2048:
- max_allowed = startup_mem / 0.0625
+ max_allowed = startup_mem // 0.0625
else:
max_allowed = VMDefaults[options.os_type].max_memory()
if max_allowed < init_allowed:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.10.01/src/vminstall/xl_console.py
new/vm-install-0.10.02/src/vminstall/xl_console.py
--- old/vm-install-0.10.01/src/vminstall/xl_console.py 2018-01-23
23:43:27.464878925 +0100
+++ new/vm-install-0.10.02/src/vminstall/xl_console.py 2018-01-30
20:36:46.068998581 +0100
@@ -55,7 +55,7 @@
try:
path = util.run(['/usr/bin/xenstore-read', read_path])
except:
- return None
+ continue
path = path.strip()
if path == vm_path:
read_path = '/local/domain/%s/domid' % domid
