Hello community,
here is the log from the commit of package vm-install for openSUSE:Factory
checked in at 2020-02-13 10:13:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vm-install (Old)
and /work/SRC/openSUSE:Factory/.vm-install.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vm-install"
Thu Feb 13 10:13:34 2020 rev:169 rq:774040 version:0.10.08
Changes:
--------
--- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2019-07-04
15:43:16.862110106 +0200
+++ /work/SRC/openSUSE:Factory/.vm-install.new.26092/vm-install.changes
2020-02-13 10:13:59.628426206 +0100
@@ -1,0 +2,8 @@
+Mon Feb 10 14:32:48 MST 2020 - carn...@suse.com
+
+- bsc#1163183 - vm-install: Parsing error acquiring bridge names
+- Add Requires python3-netifaces to spec file
+- Add winserver2019 support
+- Version 0.10.08
+
+-------------------------------------------------------------------
Old:
----
vm-install-0.10.07.tar.bz2
New:
----
vm-install-0.10.08.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vm-install.spec ++++++
--- /var/tmp/diff_new_pack.bbTOy2/_old 2020-02-13 10:14:00.384426644 +0100
+++ /var/tmp/diff_new_pack.bbTOy2/_new 2020-02-13 10:14:00.384426644 +0100
@@ -1,7 +1,7 @@
#
# spec file for package vm-install
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,18 +27,19 @@
%endif
# For directory ownership:
BuildRequires: yast2
-Version: 0.10.07
+Version: 0.10.08
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.07.tar.bz2
+Source0: %{name}-0.10.08.tar.bz2
Source1: vm-install.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: kdump
Requires: python3-dbus-python
Requires: python3-libvirt-python
Requires: python3-libxml2-python
+Requires: python3-netifaces
Requires: python3-pycurl
%if %suse_version > 1230
Requires: qemu-tools
++++++ vm-install-0.10.07.tar.bz2 -> vm-install-0.10.08.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.10.07/Makefile
new/vm-install-0.10.08/Makefile
--- old/vm-install-0.10.07/Makefile 2019-06-25 18:58:16.736763059 +0200
+++ new/vm-install-0.10.08/Makefile 2020-02-10 22:33:43.367575493 +0100
@@ -1,5 +1,5 @@
PACKAGE = vm-install
-VER = 0.10.07
+VER = 0.10.08
default:
@echo "Run 'make install DESTDIR=$destdir' to install."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.10.07/setup.py
new/vm-install-0.10.08/setup.py
--- old/vm-install-0.10.07/setup.py 2019-06-25 18:58:11.896681582 +0200
+++ new/vm-install-0.10.08/setup.py 2020-02-10 22:33:49.147351704 +0100
@@ -1,7 +1,7 @@
from distutils.core import setup
setup(name='vminstall',
- version='0.10.07',
+ version='0.10.08',
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.07/src/vminstall/VMDefaults.py
new/vm-install-0.10.08/src/vminstall/VMDefaults.py
--- old/vm-install-0.10.07/src/vminstall/VMDefaults.py 2017-09-06
16:21:56.000000000 +0200
+++ new/vm-install-0.10.08/src/vminstall/VMDefaults.py 2020-02-10
23:32:28.478934330 +0100
@@ -873,6 +873,11 @@
return msg.windows_server_2016
def multi_stage_install(self):
return 1
+class WindowsServer2019Defaults(WindowsServer2008x64Defaults):
+ def name(self):
+ return msg.windows_server_2019
+ def multi_stage_install(self):
+ return 1
class Solaris9Defaults(GenericDefaults):
def group(self):
@@ -978,6 +983,7 @@
'ubuntu10' : Ubuntu10Defaults(),
'ubuntu11' : Ubuntu11Defaults(),
'ubuntu12' : Ubuntu12Defaults(),
+ 'winserver2019' : WindowsServer2019Defaults(),
'winserver2016' : WindowsServer2016Defaults(),
'winserver2012' : WindowsServer2012Defaults(),
'winserver2008' : WindowsServer2008Defaults(),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.10.07/src/vminstall/msg.py
new/vm-install-0.10.08/src/vminstall/msg.py
--- old/vm-install-0.10.07/src/vminstall/msg.py 2017-07-07 00:53:28.000000000
+0200
+++ new/vm-install-0.10.08/src/vminstall/msg.py 2020-02-10 23:32:33.858725820
+0100
@@ -177,6 +177,7 @@
windows_server_2008_x64 = _("Windows Server 2008 (x64)")
windows_server_2012 = _("Windows Server 2012 (x64)")
windows_server_2016 = _("Windows Server 2016 (x64)")
+windows_server_2019 = _("Windows Server 2019 (x64)")
# Steps of job (some official; some unofficial...)
job_settings = _("Gathering settings...")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.10.07/src/vminstall/nics.py
new/vm-install-0.10.08/src/vminstall/nics.py
--- old/vm-install-0.10.07/src/vminstall/nics.py 2017-08-10
00:19:53.000000000 +0200
+++ new/vm-install-0.10.08/src/vminstall/nics.py 2020-02-10
22:34:08.778591588 +0100
@@ -13,6 +13,7 @@
import os
import string
import random
+import netifaces
from . import caps
from . import util
@@ -78,7 +79,15 @@
if legacy is True:
bridge_name = words[0]
else:
- bridge_name = words[9]
+ # Offset 6 for newer versions of /usr/sbin/bridge
(iproute2)
+ bridge_name = words[6]
+ try:
+ # Call this just to sanity check the bridge name
+ netifaces.ifaddresses(bridge_name)
+ except:
+ # Offset 9 for older versions of /usr/sbin/bridge
(iproute2 4.12)
+ bridge_name = words[9]
+ pass
if bridge_name not in bridges:
bridges.append(bridge_name)
return bridges
