Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2011-11-29 12:52:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-manager (Old) and /work/SRC/openSUSE:Factory/.virt-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virt-manager", Maintainer is "CARNOLD@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2011-10-29 08:01:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes 2011-11-29 12:52:49.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Nov 7 16:27:15 MST 2011 - carnold@novell.com + +- bnc#727662 - Error polling connection 'qemu:///system' with guest + init 0 + virtman-update-backend.diff + +------------------------------------------------------------------- +Fri Nov 4 16:16:51 MDT 2011 - carnold@novell.com + +- Update to latest upstream git version for various bug fixes + virtmanager: a712a7b32e6d7b7d9d53561b3ed2078190191560 + virtinst: 15d4901a3c8b855838931976e023158b8cda1c37 + +------------------------------------------------------------------- Old: ---- virtinst-git-cpu-model-name.diff virtinst-git-error-message.diff virtinst-git-hv-version.diff virtinst-git-initrd-inject.diff virtinst-git-initrd-inject2.diff virtinst-git-mac-prefix.diff virtinst-git-no-volume.diff virtinst-git-prompts.diff virtinst-git-remote-storage.diff virtinst-git-typo.diff virtinst-git-xml-clear.diff virtman-git-char-device-mode.diff virtman-git-collidelist.diff virtman-git-connection-pylint.diff virtman-git-delete.diff virtman-git-details.diff virtman-git-domain-name.diff virtman-git-error-reporting.diff virtman-git-explicit-python.diff virtman-git-finish-button.diff virtman-git-grep.diff virtman-git-netstats.diff virtman-git-no-cd-present.diff virtman-git-resize-menu.diff virtman-git-set-has-window.diff virtman-git-shutoff.diff virtman-git-storage-pool.diff virtman-git-tick-obj-lists.diff virtman-git-unapplied-changes.diff virtman-git-vcpu-count.diff New: ---- virtman-update-backend.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.W2ekTU/_old 2011-11-29 12:52:51.000000000 +0100 +++ /var/tmp/diff_new_pack.W2ekTU/_new 2011-11-29 12:52:51.000000000 +0100 @@ -38,25 +38,6 @@ Source1: %{virtinst_name}.tar.bz2 # see https://bugzilla.redhat.com/show_bug.cgi?id=620216, # https://bugzilla.novell.com/show_bug.cgi?id=641981 -Patch1: virtman-git-netstats.diff -Patch2: virtman-git-finish-button.diff -Patch3: virtman-git-shutoff.diff -Patch4: virtman-git-set-has-window.diff -Patch5: virtman-git-grep.diff -Patch6: virtman-git-no-cd-present.diff -Patch7: virtman-git-resize-menu.diff -Patch8: virtman-git-vcpu-count.diff -Patch9: virtman-git-storage-pool.diff -Patch10: virtman-git-domain-name.diff -Patch11: virtman-git-unapplied-changes.diff -Patch12: virtman-git-details.diff -Patch13: virtman-git-delete.diff -Patch14: virtman-git-collidelist.diff -Patch15: virtman-git-char-device-mode.diff -Patch16: virtman-git-connection-pylint.diff -Patch17: virtman-git-tick-obj-lists.diff -Patch18: virtman-git-error-reporting.diff -Patch19: virtman-git-explicit-python.diff Patch50: virtman-desktop.diff Patch51: virtman-vminstall.diff Patch52: virtman-cdrom.diff @@ -69,17 +50,7 @@ Patch62: virtman-storage-pool.diff Patch63: virtman-eepro100.diff Patch64: virtman-qed.diff -Patch100: virtinst-git-hv-version.diff -Patch101: virtinst-git-initrd-inject.diff -Patch102: virtinst-git-initrd-inject2.diff -Patch103: virtinst-git-no-volume.diff -Patch104: virtinst-git-prompts.diff -Patch105: virtinst-git-cpu-model-name.diff -Patch106: virtinst-git-xml-clear.diff -Patch107: virtinst-git-remote-storage.diff -Patch108: virtinst-git-error-message.diff -Patch109: virtinst-git-typo.diff -Patch110: virtinst-git-mac-prefix.diff +Patch65: virtman-update-backend.diff Patch150: virtinst-cdrom.diff Patch151: virtinst-storage-ocfs2.diff Patch152: virtinst-qed.diff @@ -164,25 +135,6 @@ %prep %setup -q %setup -b 1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 %patch50 -p1 %patch51 -p1 %patch52 -p1 @@ -195,18 +147,8 @@ #%patch62 -p1 %patch63 -p1 %patch64 -p1 +%patch65 -p1 pushd $RPM_BUILD_DIR/%{virtinst_name} -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 -%patch104 -p1 -%patch105 -p1 -%patch106 -p1 -%patch107 -p1 -%patch108 -p1 -%patch109 -p1 -%patch110 -p1 %patch150 -p1 %patch151 -p1 %patch152 -p1 ++++++ virt-manager-0.9.0.tar.bz2 ++++++ ++++ 129710 lines of diff (skipped) ++++++ virtinst-0.600.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/virt-manager/virtinst-0.600.0.tar.bz2 /work/SRC/openSUSE:Factory/.virt-manager.new/virtinst-0.600.0.tar.bz2 differ: char 11, line 1 ++++++ virtinst-qed.diff ++++++ --- /var/tmp/diff_new_pack.W2ekTU/_old 2011-11-29 12:52:52.000000000 +0100 +++ /var/tmp/diff_new_pack.W2ekTU/_new 2011-11-29 12:52:52.000000000 +0100 @@ -1,18 +1,3 @@ -Index: virtinst-0.600.0/virtinst/Storage.py -=================================================================== ---- virtinst-0.600.0.orig/virtinst/Storage.py -+++ virtinst-0.600.0/virtinst/Storage.py -@@ -1291,8 +1291,8 @@ class FileVolume(StorageVolume): - _file_type = VIR_STORAGE_VOL_FILE - - formats = ["raw", "bochs", "cloop", "cow", "dmg", "iso", "qcow", -- "qcow2", "vmdk", "vpc"] -- create_formats = ["raw", "cow", "qcow", "qcow2", "vmdk", "vpc"] -+ "qcow2", "qed", "vmdk", "vpc"] -+ create_formats = ["raw", "cow", "qcow", "qcow2", "qed", "vmdk", "vpc"] - - # Register applicable property methods from parent class - perms = property(StorageObject.get_perms, StorageObject.set_perms) Index: virtinst-0.600.0/virtinst/VirtualDisk.py =================================================================== --- virtinst-0.600.0.orig/virtinst/VirtualDisk.py ++++++ virtman-autorestart.diff ++++++ --- /var/tmp/diff_new_pack.W2ekTU/_old 2011-11-29 12:52:52.000000000 +0100 +++ /var/tmp/diff_new_pack.W2ekTU/_new 2011-11-29 12:52:52.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- virt-manager-0.9.0.orig/src/virtManager/details.py +++ virt-manager-0.9.0/src/virtManager/details.py -@@ -2019,11 +2019,9 @@ class vmmDetails(vmmGObjectUI): +@@ -2069,11 +2069,9 @@ class vmmDetails(vmmGObjectUI): return self._change_config_helper(df, da, hf, ha) @@ -17,7 +17,7 @@ if self.editted(EDIT_AUTOSTART): auto = self.widget("config-autostart") try: -@@ -2033,6 +2031,11 @@ class vmmDetails(vmmGObjectUI): +@@ -2083,6 +2081,11 @@ class vmmDetails(vmmGObjectUI): (_("Error changing autostart value: %s") % str(e))) return False @@ -29,7 +29,7 @@ if self.editted(EDIT_BOOTORDER): bootdevs = self.get_config_boot_devs() add_define(self.vm.set_boot_device, bootdevs) -@@ -2370,6 +2373,8 @@ class vmmDetails(vmmGObjectUI): +@@ -2432,6 +2435,8 @@ class vmmDetails(vmmGObjectUI): buttons=gtk.BUTTONS_OK, dialog_type=dtype) ++++++ virtman-cdrom.diff ++++++ --- /var/tmp/diff_new_pack.W2ekTU/_old 2011-11-29 12:52:52.000000000 +0100 +++ /var/tmp/diff_new_pack.W2ekTU/_new 2011-11-29 12:52:52.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- virt-manager-0.9.0.orig/src/virtManager/addhardware.py +++ virt-manager-0.9.0/src/virtManager/addhardware.py -@@ -508,6 +508,7 @@ class vmmAddHardware(vmmGObjectUI): +@@ -518,6 +518,7 @@ class vmmAddHardware(vmmGObjectUI): if self.vm.get_hv_type() == "kvm": add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio Disk") if self.conn.is_xen(): ++++++ virtman-desktop.diff ++++++ --- /var/tmp/diff_new_pack.W2ekTU/_old 2011-11-29 12:52:52.000000000 +0100 +++ /var/tmp/diff_new_pack.W2ekTU/_new 2011-11-29 12:52:52.000000000 +0100 @@ -15,7 +15,7 @@ =================================================================== --- virt-manager-0.9.0.orig/src/Makefile.in +++ virt-manager-0.9.0/src/Makefile.in -@@ -255,7 +255,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in +@@ -212,7 +212,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in libexec_SCRIPTS = $(PACKAGE)-launch gladedir = $(pkgdatadir) glade_DATA = $(wildcard $(srcdir)/*.glade) ++++++ virtman-device-flags.diff ++++++ --- /var/tmp/diff_new_pack.W2ekTU/_old 2011-11-29 12:52:52.000000000 +0100 +++ /var/tmp/diff_new_pack.W2ekTU/_new 2011-11-29 12:52:52.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- virt-manager-0.9.0.orig/src/virtManager/addhardware.py +++ virt-manager-0.9.0/src/virtManager/addhardware.py -@@ -1021,6 +1021,18 @@ class vmmAddHardware(vmmGObjectUI): +@@ -1069,6 +1069,18 @@ class vmmAddHardware(vmmGObjectUI): self._dev.get_xml_config() logging.debug("Adding device:\n" + self._dev.get_xml_config()) @@ -25,7 +25,7 @@ =================================================================== --- virt-manager-0.9.0.orig/src/virtManager/details.py +++ virt-manager-0.9.0/src/virtManager/details.py -@@ -2256,6 +2256,17 @@ class vmmDetails(vmmGObjectUI): +@@ -2318,6 +2318,17 @@ class vmmDetails(vmmGObjectUI): text1=(_("Are you sure you want to remove this device?"))): return @@ -47,7 +47,7 @@ =================================================================== --- virt-manager-0.9.0.orig/src/virtManager/domain.py +++ virt-manager-0.9.0/src/virtManager/domain.py -@@ -697,6 +697,10 @@ class vmmDomain(vmmLibvirtObject): +@@ -718,6 +718,10 @@ class vmmDomain(vmmLibvirtObject): devxml = devobj.get_xml_config() self._backend.attachDevice(devxml) @@ -58,7 +58,7 @@ def detach_device(self, devobj): """ Hotunplug device from running guest -@@ -715,6 +719,10 @@ class vmmDomain(vmmLibvirtObject): +@@ -736,6 +740,10 @@ class vmmDomain(vmmLibvirtObject): xml = devobj.get_xml_config() self._backend.updateDeviceFlags(xml, flags) ++++++ virtman-eepro100.diff ++++++ --- /var/tmp/diff_new_pack.W2ekTU/_old 2011-11-29 12:52:52.000000000 +0100 +++ /var/tmp/diff_new_pack.W2ekTU/_new 2011-11-29 12:52:52.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- virt-manager-0.9.0.orig/src/virtManager/uihelpers.py +++ virt-manager-0.9.0/src/virtManager/uihelpers.py -@@ -290,6 +290,7 @@ def populate_netmodel_combo(vm, combo): +@@ -309,6 +309,7 @@ def populate_netmodel_combo(vm, combo): if vm.is_hvm(): mod_list = ["rtl8139", "ne2k_pci", "pcnet", "e1000"] if vm.get_hv_type() in ["kvm", "qemu", "test"]: ++++++ virtman-keycombo.diff ++++++ --- /var/tmp/diff_new_pack.W2ekTU/_old 2011-11-29 12:52:52.000000000 +0100 +++ /var/tmp/diff_new_pack.W2ekTU/_new 2011-11-29 12:52:52.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- virt-manager-0.9.0.orig/src/virtManager/uihelpers.py +++ virt-manager-0.9.0/src/virtManager/uihelpers.py -@@ -934,6 +934,16 @@ def build_keycombo_menu(cb): +@@ -953,6 +953,16 @@ def build_keycombo_menu(cb): make_item("Ctrl+Alt+_Backspace", ["Control_L", "Alt_L", "BackSpace"]) make_item("Ctrl+Alt+_Delete", ["Control_L", "Alt_L", "Delete"]) menu.add(gtk.SeparatorMenuItem()) ++++++ virtman-qed.diff ++++++ --- /var/tmp/diff_new_pack.W2ekTU/_old 2011-11-29 12:52:52.000000000 +0100 +++ /var/tmp/diff_new_pack.W2ekTU/_new 2011-11-29 12:52:52.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- virt-manager-0.9.0.orig/src/virtManager/uihelpers.py +++ virt-manager-0.9.0/src/virtManager/uihelpers.py -@@ -376,12 +376,12 @@ def build_storage_format_combo(vm, combo +@@ -395,12 +395,12 @@ def build_storage_format_combo(vm, combo combo.set_model(dev_model) combo.set_text_column(0) ++++++ virtman-update-backend.diff ++++++ Index: virt-manager-0.9.0/src/virtManager/domain.py =================================================================== --- virt-manager-0.9.0.orig/src/virtManager/domain.py +++ virt-manager-0.9.0/src/virtManager/domain.py @@ -1562,7 +1562,14 @@ class vmmDomain(vmmLibvirtObject): # Invalidate cached values self._invalidate_xml() - info = self._backend.info() + try: + info = self._backend.info() + except: + self._backend = self.conn.vmm.lookupByName(self.get_name()) + info = self._backend.info() + if info[0] == libvirt.VIR_DOMAIN_NOSTATE: + self._backend = self.conn.vmm.lookupByName(self.get_name()) + info = self._backend.info() expected = self.config.get_stats_history_length() current = len(self.record) if current > expected: ++++++ virtman-vminstall.diff ++++++ --- /var/tmp/diff_new_pack.W2ekTU/_old 2011-11-29 12:52:52.000000000 +0100 +++ /var/tmp/diff_new_pack.W2ekTU/_new 2011-11-29 12:52:52.000000000 +0100 @@ -10,7 +10,7 @@ from virtManager.host import vmmHost from virtManager.error import vmmErrorDialog from virtManager.systray import vmmSystray -@@ -818,11 +817,45 @@ class vmmEngine(vmmGObject): +@@ -818,11 +817,47 @@ class vmmEngine(vmmGObject): self.windowCreate = obj return self.windowCreate @@ -22,6 +22,8 @@ - self._get_create_dialog().show(src.topwin, uri) - except Exception, e: - src.err.show_err(_("Error launching manager: %s") % str(e)) ++ if uri is None: ++ uri = default_uri() + conn = self._lookup_conn(uri) + do_remote = conn.is_remote() + if self.windowCreate == None or do_remote != self.remote_install: @@ -72,7 +74,7 @@ self.topwin.hide() self.remove_timers() -@@ -2127,3 +2128,4 @@ class vmmCreate(vmmGObjectUI): +@@ -2131,3 +2132,4 @@ class vmmCreate(vmmGObjectUI): vmmGObjectUI.type_register(vmmCreate) vmmCreate.signal_new(vmmCreate, "action-show-vm", [str, str]) vmmCreate.signal_new(vmmCreate, "action-show-help", [str]) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org