Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2012-05-15 17:42:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vm-install (Old) and /work/SRC/openSUSE:Factory/.vm-install.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vm-install", Maintainer is "carn...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2012-05-03 11:01:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2012-05-15 17:42:42.000000000 +0200 @@ -1,0 +2,24 @@ +Wed May 9 10:28:17 MDT 2012 - carn...@novell.com + +- bnc#754906 - virt-manager is not allowing to upgrade oes11 to + oes11sp1 machine + +------------------------------------------------------------------- +Tue May 8 15:32:34 MDT 2012 - carn...@novell.com + +- bnc#761142 - vm-install fails to create its new VM: bogus "Not + enough space on device" message + +------------------------------------------------------------------- +Thu May 3 13:44:36 MDT 2012 - carn...@novell.com + +- bnc#760557 - Error: Two of the virtual disks have conflicting + virtual names or physical devices + +------------------------------------------------------------------- +Wed May 2 10:39:47 MDT 2012 - carn...@novell.com + +- bnc#760023 - Can't upgrade an OES 2 (64-bit) XEN Guest Server to + OES 11 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.HTFD49/_old 2012-05-15 17:42:43.000000000 +0200 +++ /var/tmp/diff_new_pack.HTFD49/_new 2012-05-15 17:42:43.000000000 +0200 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: vm-install Url: http://developer.novell.com/wiki/index.php/Vm-install BuildRequires: python-devel ++++++ vm-install-0.6.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.3/src/vmdisks/disks.py new/vm-install-0.6.3/src/vmdisks/disks.py --- old/vm-install-0.6.3/src/vmdisks/disks.py 2012-02-29 18:06:40.000000000 +0100 +++ new/vm-install-0.6.3/src/vmdisks/disks.py 2012-05-09 22:13:25.000000000 +0200 @@ -439,8 +439,11 @@ except: pass for arg in params[2:]: - if arg in ('r', 'w'): - ro = arg + if arg in ('r', 'w', 'w!'): + if arg == 'r': + ro = True + else: + ro = False elif arg in ('disk', 'cdrom', 'floppy'): vdevType = arg elif arg.startswith('cachemode='): @@ -459,14 +462,12 @@ continue else: kv = arg.split('=', 1) - if len(kv) == 1: - kv[1] = True - else: + if len(kv) > 1: try: kv[1] = int(kv[1]) except: continue - args[kv[0]] = kv[1] + args[kv[0]] = kv[1] continue disk = Disk(pdev=pdev, vdev=vdev, vdevType=vdevType, ro=ro, blocks=blocks, virtio=virtio) if extended: @@ -760,16 +761,16 @@ if disk.get_vdevtype() != disk.DEVICE_DISK: continue dpath = disk.get_path() - if os.path.exists(dpath): - dsize = disk.driver.size(dpath) - vsize = disk.get_virtual_size() - if dsize is not None and vsize is not None: - if dsize <= vsize: - blocks = vsize - dsize - requested_blocks += blocks - continue fs = self._get_fs(disk.get_pdev()) if new_disk_fs == fs: + if os.path.exists(dpath): + dsize = disk.driver.size(dpath) + vsize = disk.get_virtual_size() + if dsize is not None and vsize is not None: + if dsize <= vsize: + blocks = vsize - dsize + requested_blocks += blocks + continue blocks = disk.get_virtual_size() if blocks is not None: requested_blocks += blocks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.3/src/vminstall/options.py new/vm-install-0.6.3/src/vminstall/options.py --- old/vm-install-0.6.3/src/vminstall/options.py 2011-10-26 19:24:20.000000000 +0200 +++ new/vm-install-0.6.3/src/vminstall/options.py 2012-05-09 22:13:36.000000000 +0200 @@ -794,6 +794,8 @@ log.debug('Error reading configuration file for %s' % vm_name) raise InstSrcError(err=InstSrcError.E_CONFIG) os.unlink(fname) + options.disks = None + options.nics = None image_start = 0 image_data = [] device_start = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.6.3/src/vminstall/util.py new/vm-install-0.6.3/src/vminstall/util.py --- old/vm-install-0.6.3/src/vminstall/util.py 2011-05-20 23:18:18.000000000 +0200 +++ new/vm-install-0.6.3/src/vminstall/util.py 2012-05-09 22:13:54.000000000 +0200 @@ -335,6 +335,7 @@ continue value = line[:-1].split('=', 1)[1] value = value.strip('"') + value = value.strip('\'') return value return None -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
