Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2014-08-13 08:49: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 2014-07-25 09:10:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2014-08-13 08:49:22.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 4 16:46:58 MDT 2014 - [email protected] + +- bnc#890302 - Vm-install gets a "'module' object has no attribute + 'connection'" error +- Version 0.8.31 + +------------------------------------------------------------------- Old: ---- vm-install-0.8.30.tar.bz2 New: ---- vm-install-0.8.31.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.HIQs91/_old 2014-08-13 08:49:23.000000000 +0200 +++ /var/tmp/diff_new_pack.HIQs91/_new 2014-08-13 08:49:23.000000000 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: vm-install %if %suse_version <= 1230 %define with_vminstall_as_default_installer 1 @@ -26,12 +27,12 @@ %endif # For directory ownership: BuildRequires: yast2 -Version: 0.8.30 +Version: 0.8.31 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.30.tar.bz2 +Source0: %{name}-0.8.31.tar.bz2 Source1: vm-install.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 s390x ppc64le ++++++ vm-install-0.8.30.tar.bz2 -> vm-install-0.8.31.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.30/Makefile new/vm-install-0.8.31/Makefile --- old/vm-install-0.8.30/Makefile 2014-07-23 18:34:47.000000000 +0200 +++ new/vm-install-0.8.31/Makefile 2014-08-05 00:47:31.000000000 +0200 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.8.30 +VER = 0.8.31 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.30/setup.py new/vm-install-0.8.31/setup.py --- old/vm-install-0.8.30/setup.py 2014-07-23 18:34:41.000000000 +0200 +++ new/vm-install-0.8.31/setup.py 2014-08-05 00:47:28.000000000 +0200 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.8.30', + version='0.8.31', description='Define a virtual machine and install its operating system', author='Charles Coffing', author_email='[email protected]', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.30/src/vminstall/ParaVirtGuest.py new/vm-install-0.8.31/src/vminstall/ParaVirtGuest.py --- old/vm-install-0.8.30/src/vminstall/ParaVirtGuest.py 2014-06-27 03:39:23.000000000 +0200 +++ new/vm-install-0.8.31/src/vminstall/ParaVirtGuest.py 2014-08-04 16:19:13.000000000 +0200 @@ -435,10 +435,9 @@ ramdisk = '' if self.runtime['initrd']: ramdisk = ',%s' % self.runtime['initrd'] - if self.options.use_xl and \ - (self.options.os_type == "sles12" or \ + if self.options.os_type == "sles12" or \ self.options.os_type == "sled12" or \ - self.options.os_type == "rhel7"): + self.options.os_type == "rhel7": return """builder="linux" #bootargs="" #extra="%(runtime_args)s %(extra_args)s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.30/src/vminstall/VMDefaults.py new/vm-install-0.8.31/src/vminstall/VMDefaults.py --- old/vm-install-0.8.30/src/vminstall/VMDefaults.py 2014-07-22 16:04:20.000000000 +0200 +++ new/vm-install-0.8.31/src/vminstall/VMDefaults.py 2014-08-06 03:13:22.000000000 +0200 @@ -733,6 +733,8 @@ return "sb16" else: return "ac97" + def multi_stage_install(self): + return 1 class WindowsXPx64Defaults(WindowsDefaults): def name(self): return msg.windows_xp_x64 @@ -742,6 +744,8 @@ return caps.vcpu_processors(2) def apic(self): return True + def multi_stage_install(self): + return 1 class WindowsVistaDefaults(WindowsDefaults): def name(self): return msg.windows_vista @@ -767,6 +771,8 @@ return "sb16" else: return "ac97" + def multi_stage_install(self): + return 1 class WindowsVistax64Defaults(WindowsVistaDefaults): def name(self): return msg.windows_vista_x64 @@ -801,6 +807,8 @@ return caps.vcpu_processors(4) def apic(self): return True + def multi_stage_install(self): + return 2 class WindowsServer2008x64Defaults(WindowsServer2008Defaults): def name(self): return msg.windows_server_2008_x64 @@ -809,8 +817,6 @@ return True else: return False - def multi_stage_install(self): - return 2 class WindowsServer2012Defaults(WindowsServer2008x64Defaults): def name(self): return msg.windows_server_2012 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.30/src/vminstall/job.py new/vm-install-0.8.31/src/vminstall/job.py --- old/vm-install-0.8.30/src/vminstall/job.py 2014-07-22 16:04:20.000000000 +0200 +++ new/vm-install-0.8.31/src/vminstall/job.py 2014-07-31 23:20:56.000000000 +0200 @@ -297,6 +297,7 @@ finally: if hypervisor.connection: del hypervisor.connection + hypervisor.connection = None def _handle_cancel_signal(self, signum, frame): log.debug("handle_cancel_signal") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.8.30/src/vminstall/options.py new/vm-install-0.8.31/src/vminstall/options.py --- old/vm-install-0.8.30/src/vminstall/options.py 2014-07-22 16:04:20.000000000 +0200 +++ new/vm-install-0.8.31/src/vminstall/options.py 2014-08-05 22:19:07.000000000 +0200 @@ -209,7 +209,7 @@ #FIXME: the first time through here, the domain does not exist (correct behavior). # However, libvirt spits out "libvir: QEMU error : Domain not found" # It would be nice to remove that error message. - if hypervisor.connection.domain(value): + if hypervisor.connection and hypervisor.connection.domain(value): if self.install != OS_INSTALL_UPGRADE: raise VmError(err=VmError.E_CONF_EXISTS) elif item == 'nics': ++++++ vm-install.conf ++++++ --- /var/tmp/diff_new_pack.HIQs91/_old 2014-08-13 08:49:24.000000000 +0200 +++ /var/tmp/diff_new_pack.HIQs91/_new 2014-08-13 08:49:24.000000000 +0200 @@ -2,8 +2,12 @@ # /etc/default/vm-install # -# Location of images for file backed VMs +# Location of Xen images for file backed VMs #XEN_IMAGE_DIR=/var/lib/libvirt/images +# Location of Xen images when --use-xl flag is specified +#XEN_IMAGE_DIR=/var/lib/xen/images + +# Location of KVM images for file backed VMs #KVM_IMAGE_DIR=/var/lib/libvirt/images # Location for VM configuration files @@ -15,7 +19,7 @@ #KVM_LOG_DIR=/var/log/kvm/ # Default block device type to use for file backed VMs -# Xen examples: file, tap:aio, tap:qcow +# Xen examples: file, qcow2, vhd # KVM examples: file, qcow2, qed, vpc #XEN_FILE_FORMAT_TYPE=file #KVM_FILE_FORMAT_TYPE=file @@ -29,5 +33,6 @@ # VM Graphics Viewer # Valid options: virt-viewer, vnc, sdl, or text +# Note that when --use-xl is specified the viewer can only be vnc #GRAPHICS_VIEWER=virt-viewer -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
