Hello community, here is the log from the commit of package python-virtinst for openSUSE:Factory checked in at 2012-02-22 15:54:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-virtinst (Old) and /work/SRC/openSUSE:Factory/.python-virtinst.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-virtinst", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/python-virtinst/python-virtinst.changes 2011-09-23 12:43:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-virtinst.new/python-virtinst.changes 2012-02-22 15:54:58.000000000 +0100 @@ -1,0 +2,31 @@ +Fri Feb 3 08:37:05 MST 2012 - [email protected] + +- Update to virtinst 0.600.1 + * virt-install: --redir option for usb redirection (Marc-André Lureau) + * virt-install: Advanced --controller support for usb2 (Marc-André Lureau) + * Many bug fixes and minor improvments. + +------------------------------------------------------------------- +Thu Jan 5 17:06:07 MST 2012 - [email protected] + +- Include patches from the virtinst contained in the virt-manager + package. + +------------------------------------------------------------------- +Mon Nov 28 16:14:18 MST 2011 - [email protected] + +- Update to upstream git version for various bug fixes + virtinst: 15d4901a3c8b855838931976e023158b8cda1c37 +- Compatibility update to virtinst 0.600.0 for virt-manager in os12.1 + * virt-install: Various improvements to enable LXC/container guests: + * New --filesystem option for <filesystem> devices + * New --init option for container <init> path + * New --container option (similar to --paravirt or --hvm) + * virt-install: Make --location remotely (with latest libvirt) + * virt-install: New --smartcard option for <smartcard> devices + * (Marc-André Lureau) + * virt-install: New --numatune option for building guest <numatune> XML + * virt-install: option to set --disk error_policy= + * virt-install: option to set --disk serial= + +------------------------------------------------------------------- Old: ---- virtinst-0.500.6.tar.gz New: ---- virtinst-0.600.1.tar.bz2 virtinst-cdrom.diff virtinst-qed.diff virtinst-storage-ocfs2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-virtinst.spec ++++++ --- /var/tmp/diff_new_pack.daymAs/_old 2012-02-22 15:55:00.000000000 +0100 +++ /var/tmp/diff_new_pack.daymAs/_new 2012-02-22 15:55:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-virtinst # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} # This macro is used for the continuous automated builds. It just @@ -33,17 +32,20 @@ %endif Summary: Python modules and tools for creating virtual machines with libvirt +License: GPL-2.0+ +Group: System/Monitoring Name: python-%{appname} -Version: 0.500.6 -Release: 1 -Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz +Version: 0.600.1 +Release: 0 +Source0: %{appname}-%{version}.tar.bz2 +Patch10: virtinst-cdrom.diff +Patch12: virtinst-storage-ocfs2.diff +Patch13: virtinst-qed.diff -License: GPLv2+ -Group: System/Monitoring BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildArch: noarch -Url: http://virt-manager.et.redhat.com/download.html +Url: http://virt-manager.org Provides: virt-install Provides: virt-clone Provides: virt-image @@ -70,6 +72,9 @@ %prep %setup -q -n %{appname}-%{version} +%patch10 -p1 +%patch12 -p1 +%patch13 -p1 %build python setup.py build ++++++ virtinst-0.500.6.tar.gz -> virtinst-0.600.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/python-virtinst/virtinst-0.500.6.tar.gz /work/SRC/openSUSE:Factory/.python-virtinst.new/virtinst-0.600.1.tar.bz2 differ: char 1, line 1 ++++++ virtinst-cdrom.diff ++++++ Index: virtinst-0.600.1/virtinst/VirtualDisk.py =================================================================== --- virtinst-0.600.1.orig/virtinst/VirtualDisk.py +++ virtinst-0.600.1/virtinst/VirtualDisk.py @@ -1735,7 +1735,7 @@ class VirtualDisk(VirtualDevice): if maxnode > (26 * 26 * 26): raise RuntimeError("maxnode value is too high") - # Regular scanning + # Start cdrom at 'c' and skip 'c' for non-cdrom for i in range(1, maxnode + 1): gen_t = prefix @@ -1761,8 +1761,14 @@ class VirtualDisk(VirtualDevice): if gen_t in except_targets: continue if gen_t not in skip_targets: - self.target = gen_t - return self.target + if self.device != self.DEVICE_CDROM: + if i != ord('c') - ord('a'): + self.target = gen_t + return self.target + else: + if i >= ord('c') - ord('a'): + self.target = gen_t + return self.target # Check except_targets for any options for t in except_targets: ++++++ virtinst-qed.diff ++++++ Index: virtinst-0.600.1/virtinst/VirtualDisk.py =================================================================== --- virtinst-0.600.1.orig/virtinst/VirtualDisk.py +++ virtinst-0.600.1/virtinst/VirtualDisk.py @@ -295,10 +295,11 @@ class VirtualDisk(VirtualDevice): DRIVER_TAP_RAW = "aio" DRIVER_TAP_QCOW = "qcow" + DRIVER_TAP_QED = "qed" DRIVER_TAP_VMDK = "vmdk" DRIVER_TAP_VDISK = "vdisk" driver_types = [DRIVER_TAP_RAW, DRIVER_TAP_QCOW, - DRIVER_TAP_VMDK, DRIVER_TAP_VDISK] + DRIVER_TAP_QED, DRIVER_TAP_VMDK, DRIVER_TAP_VDISK] CACHE_MODE_NONE = "none" CACHE_MODE_WRITETHROUGH = "writethrough" Index: virtinst-0.600.1/virtinst/ImageParser.py =================================================================== --- virtinst-0.600.1.orig/virtinst/ImageParser.py +++ virtinst-0.600.1/virtinst/ImageParser.py @@ -200,6 +200,7 @@ class Disk: FORMAT_ISO = "iso" FORMAT_QCOW = "qcow" FORMAT_QCOW2 = "qcow2" + FORMAT_QED = "qed" FORMAT_VMDK = "vmdk" USE_SYSTEM = "system" @@ -227,7 +228,7 @@ class Disk: csumtype = xpathString(d, "@type") csumvalue = xpathString(d, "") self.csum[csumtype] = csumvalue - formats = [Disk.FORMAT_RAW, Disk.FORMAT_QCOW, Disk.FORMAT_QCOW2, Disk.FORMAT_VMDK, Disk.FORMAT_ISO] + formats = [Disk.FORMAT_RAW, Disk.FORMAT_QCOW, Disk.FORMAT_QCOW2, Disk.FORMAT_QED, Disk.FORMAT_VMDK, Disk.FORMAT_ISO] validate(formats.count(self.format) > 0, _("The format for disk %s must be one of %s") % (self.file, ",".join(formats))) Index: virtinst-0.600.1/virtconv/diskcfg.py =================================================================== --- virtinst-0.600.1.orig/virtconv/diskcfg.py +++ virtinst-0.600.1/virtconv/diskcfg.py @@ -35,6 +35,7 @@ DISK_FORMAT_VDISK = 3 DISK_FORMAT_QCOW = 4 DISK_FORMAT_QCOW2 = 5 DISK_FORMAT_COW = 6 +DISK_FORMAT_QED = 7 DISK_TYPE_DISK = 0 DISK_TYPE_CDROM = 1 @@ -50,6 +51,7 @@ disk_suffixes = { DISK_FORMAT_QCOW: ".qcow", DISK_FORMAT_QCOW2: ".qcow2", DISK_FORMAT_COW: ".cow", + DISK_FORMAT_QED: ".qed", } qemu_formats = { @@ -59,6 +61,7 @@ qemu_formats = { DISK_FORMAT_QCOW: "qcow", DISK_FORMAT_QCOW2: "qcow2", DISK_FORMAT_COW: "cow", + DISK_FORMAT_QED: "qed", } disk_format_names = { @@ -69,6 +72,7 @@ disk_format_names = { "qcow": DISK_FORMAT_QCOW, "qcow2": DISK_FORMAT_QCOW2, "cow": DISK_FORMAT_COW, + "qed": DISK_FORMAT_QED, } checksum_types = { @@ -260,7 +264,8 @@ class disk(object): out_format == DISK_FORMAT_VMDK or out_format == DISK_FORMAT_QCOW or out_format == DISK_FORMAT_QCOW2 or - out_format == DISK_FORMAT_COW): + out_format == DISK_FORMAT_COW or + out_format == DISK_FORMAT_QED): raise NotImplementedError(_("Cannot convert to disk format %s") % output_format) Index: virtinst-0.600.1/virtconv/parsers/virtimage.py =================================================================== --- virtinst-0.600.1.orig/virtconv/parsers/virtimage.py +++ virtinst-0.600.1/virtconv/parsers/virtimage.py @@ -246,6 +246,7 @@ class virtimage_parser(formats.parser): ImageParser.Disk.FORMAT_VMDK: diskcfg.DISK_FORMAT_VMDK, ImageParser.Disk.FORMAT_QCOW: diskcfg.DISK_FORMAT_QCOW, ImageParser.Disk.FORMAT_QCOW2: diskcfg.DISK_FORMAT_QCOW2, + ImageParser.Disk.FORMAT_QED: diskcfg.DISK_FORMAT_QED, } fmt = None ++++++ virtinst-storage-ocfs2.diff ++++++ Index: virtinst-0.600.1/virtinst/Storage.py =================================================================== --- virtinst-0.600.1.orig/virtinst/Storage.py +++ virtinst-0.600.1/virtinst/Storage.py @@ -534,7 +534,7 @@ class FilesystemPool(StoragePool): get_volume_class = staticmethod(get_volume_class) formats = [ "auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf", - "gfs", "gfs2", "vfat", "hfs+", "xfs" ] + "gfs", "gfs2", "vfat", "hfs+", "xfs", "ocfs2" ] # Register applicable property methods from parent class perms = property(StorageObject.get_perms, StorageObject.set_perms) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
