Hello community,
here is the log from the commit of package vm-install for openSUSE:Factory
checked in at 2013-05-02 12:03:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vm-install (Old)
and /work/SRC/openSUSE:Factory/.vm-install.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vm-install"
Changes:
--------
--- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2013-02-25
21:45:39.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes
2013-05-02 12:03:13.000000000 +0200
@@ -1,0 +2,13 @@
+Mon Apr 22 11:26:38 MDT 2013 - carn...@suse.com
+
+- bnc#812626 - Virt-Install prepends string causing error when
+ pointing to ISO
+- Version 0.6.17
+
+-------------------------------------------------------------------
+Mon Mar 18 14:17:53 MDT 2013 - carn...@suse.com
+
+- bnc#809464 - vm-install fails when selecting PXE as the boot
+ method with PV guest - SLES11SP3 Beta2
+
+-------------------------------------------------------------------
@@ -5 +18 @@
-- Version 0.6.14
+- Version 0.6.16
Old:
----
vm-install-0.6.16.tar.bz2
New:
----
vm-install-0.6.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vm-install.spec ++++++
--- /var/tmp/diff_new_pack.9prj3m/_old 2013-05-02 12:03:15.000000000 +0200
+++ /var/tmp/diff_new_pack.9prj3m/_new 2013-05-02 12:03:15.000000000 +0200
@@ -22,12 +22,12 @@
BuildRequires: update-desktop-files
# For directory ownership:
BuildRequires: yast2
-Version: 0.6.16
+Version: 0.6.17
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.6.16.tar.bz2
+Source0: %{name}-0.6.17.tar.bz2
Source1: vm-install.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 s390x
++++++ vm-install-0.6.16.tar.bz2 -> vm-install-0.6.17.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.6.16/Makefile
new/vm-install-0.6.17/Makefile
--- old/vm-install-0.6.16/Makefile 2013-02-22 19:00:18.000000000 +0100
+++ new/vm-install-0.6.17/Makefile 2013-04-22 19:48:48.000000000 +0200
@@ -1,5 +1,5 @@
PACKAGE = vm-install
-VER = 0.6.16
+VER = 0.6.17
default:
@echo "Run 'make install DESTDIR=$destdir' to install."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.6.16/setup.py
new/vm-install-0.6.17/setup.py
--- old/vm-install-0.6.16/setup.py 2013-02-22 18:59:16.000000000 +0100
+++ new/vm-install-0.6.17/setup.py 2013-04-22 19:48:48.000000000 +0200
@@ -1,7 +1,7 @@
from distutils.core import setup
setup(name='vminstall',
- version='0.6.16',
+ version='0.6.17',
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.6.16/src/vminstall/gtk/disk_widgets.py
new/vm-install-0.6.17/src/vminstall/gtk/disk_widgets.py
--- old/vm-install-0.6.16/src/vminstall/gtk/disk_widgets.py 2011-05-20
23:18:24.000000000 +0200
+++ new/vm-install-0.6.17/src/vminstall/gtk/disk_widgets.py 2013-04-22
19:48:48.000000000 +0200
@@ -458,7 +458,9 @@
self.disk_edit_widget.get_toplevel(),
file=file, mode=mode, folder=self.disk_folder)
if file and folder not in file:
- file = folder + "/" + file
+ check_file = folder + "/" + file
+ if os.path.exists(check_file):
+ file = check_file
if file != None:
self.disk_folder = folder
text = self.disk.disk_image_type(file)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.6.16/src/vminstall/msg.py
new/vm-install-0.6.17/src/vminstall/msg.py
--- old/vm-install-0.6.16/src/vminstall/msg.py 2012-10-04 23:47:37.000000000
+0200
+++ new/vm-install-0.6.17/src/vminstall/msg.py 2013-04-22 19:48:48.000000000
+0200
@@ -223,7 +223,7 @@
intro_help4 = _("The <b>location</b> of the files necessary to install an
operating system on the VM, or a <b>disk</b> that already has an operating
system")
intro_help5 = _("Other characteristics of the VM, such as <b>memory</b>,
<b>processors</b>, and <b>network adapters</b>.")
#TRANSLATORS Do not translate %(url)s
-intro_help6 = _("For the most current information on Novell VM server
technology, see ")
+intro_help6 = _("For the most current information on SUSE VM server
technology, see ")
intro_help6_http = _("%(url)s")
install_help = _("If you are creating this VM from scratch, you will need to
install an operating system. When migrating a physical machine to a virtual
machine, the disk with the existing operating system can often be reused for
the VM.")
os_install_yes = _("I need to install an operating system.")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.6.16/src/vminstall/options.py
new/vm-install-0.6.17/src/vminstall/options.py
--- old/vm-install-0.6.16/src/vminstall/options.py 2012-10-04
23:45:56.000000000 +0200
+++ new/vm-install-0.6.17/src/vminstall/options.py 2013-04-22
19:48:48.000000000 +0200
@@ -417,6 +417,16 @@
defaults.os_type = options.os_type
else:
options.os_type = defaults.os_type = default_os_type
+ if old_os_type != 'pxe' and defaults.os_type == 'pxe':
+ # PXE is treated like an os_type with a minimal set of default
settings.
+ # It really should just be an installation source, not an os type.
+ # Copy the defaults for the type we are switching from so they can be
+ # preserved when 'pxe' is selected as a source.
+ excluded_keys = [ 'pxe_boot', 'pxe_addr', 'pxe_label', 'source',
'_install_args' ]
+ for key in defaults.__dict__.keys():
+ if key not in excluded_keys:
+ value = getattr(defaults, key)
+ options.__dict__[key] = value
vmdefaults = VMDefaults[defaults.os_type]
if options.pxe_boot:
@@ -477,7 +487,8 @@
elif defaults.name is None or old_os_type != defaults.os_type:
i = 0
while True:
- name = defaults.os_type
+ if defaults.os_type != 'pxe':
+ name = defaults.os_type
if i:
name += '-%d' % i
try:
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
