Hello community,
here is the log from the commit of package vm-install for openSUSE:Factory
checked in at 2016-05-17 17:16:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2016-04-30
23:32:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes
2016-05-17 17:16:32.000000000 +0200
@@ -1,0 +2,7 @@
+Wed May 4 11:11:26 MDT 2016 - carn...@suse.com
+
+- bsc#978526 - text mode installation doesn't allow specifying
+ install source
+- Version 0.8.52
+
+-------------------------------------------------------------------
Old:
----
vm-install-0.8.51.tar.bz2
New:
----
vm-install-0.8.52.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vm-install.spec ++++++
--- /var/tmp/diff_new_pack.Nc2uxw/_old 2016-05-17 17:16:33.000000000 +0200
+++ /var/tmp/diff_new_pack.Nc2uxw/_new 2016-05-17 17:16:33.000000000 +0200
@@ -27,12 +27,12 @@
%endif
# For directory ownership:
BuildRequires: yast2
-Version: 0.8.51
+Version: 0.8.52
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.8.51.tar.bz2
+Source0: %{name}-0.8.52.tar.bz2
Source1: vm-install.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: dbus-1-python
++++++ vm-install-0.8.51.tar.bz2 -> vm-install-0.8.52.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.8.51/Makefile
new/vm-install-0.8.52/Makefile
--- old/vm-install-0.8.51/Makefile 2016-04-21 00:03:51.000000000 +0200
+++ new/vm-install-0.8.52/Makefile 2016-05-09 16:04:08.000000000 +0200
@@ -1,5 +1,5 @@
PACKAGE = vm-install
-VER = 0.8.51
+VER = 0.8.52
default:
@echo "Run 'make install DESTDIR=$destdir' to install."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vm-install-0.8.51/setup.py
new/vm-install-0.8.52/setup.py
--- old/vm-install-0.8.51/setup.py 2016-04-21 00:03:44.000000000 +0200
+++ new/vm-install-0.8.52/setup.py 2016-05-09 16:04:14.000000000 +0200
@@ -1,7 +1,7 @@
from distutils.core import setup
setup(name='vminstall',
- version='0.8.51',
+ version='0.8.52',
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.8.51/src/vminstall/text/interface.py
new/vm-install-0.8.52/src/vminstall/text/interface.py
--- old/vm-install-0.8.51/src/vminstall/text/interface.py 2015-06-08
22:41:24.000000000 +0200
+++ new/vm-install-0.8.52/src/vminstall/text/interface.py 2016-05-09
16:04:40.000000000 +0200
@@ -434,8 +434,6 @@
if options.pxe_boot == True:
options.os_type = 'pxe'
return
- if options.source:
- return
vmdefaults = VMDefaults[options.os_type]
install_selections = {}
@@ -452,9 +450,13 @@
default = url
else:
network_protocols.append(p)
+ if options.source:
+ default = 'host'
+ install_selections[default] = '%s (%s)' %
(vminstall.msg.installation_source_prompt, options.source)
if network_protocols:
- default = 'network'
- install_selections[default] = '%s (%s)' % (vminstall.msg.network_url,
', '.join(network_protocols),)
+ install_selections['network'] = '%s (%s)' %
(vminstall.msg.network_url, ', '.join(network_protocols),)
+ if default is None:
+ default = 'network'
if default is None:
# Validation step will catch this error, and allow user to retry.
return
@@ -463,6 +465,8 @@
url = prompt_selection_by_number(vminstall.msg.install_media_help,
install_selections, default)
try:
+ if options.source and url == 'host':
+ break
if not url.startswith('dev:/'):
url = prompt_string("Type the install URL:")
options.source = url
