Hello community, here is the log from the commit of package python-virtinst for openSUSE:Factory checked in at 2012-03-16 13:23:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-virtinst (Old) and /work/SRC/openSUSE:Factory/.python-virtinst.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-virtinst", Maintainer is "CARNOLD@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/python-virtinst/python-virtinst.changes 2012-03-06 13:41:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-virtinst.new/python-virtinst.changes 2012-03-16 13:23:51.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Mar 14 10:19:58 MDT 2012 - carnold@novell.com + +- bnc#752138 - python-virtinst causes virt-manager uninstall + python-virtinst.spec +- SUSE URL installs want install= rather than method= + virtinst-git-suse-url.diff + +------------------------------------------------------------------- New: ---- virtinst-git-suse-url.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-virtinst.spec ++++++ --- /var/tmp/diff_new_pack.xcgjaG/_old 2012-03-16 13:23:53.000000000 +0100 +++ /var/tmp/diff_new_pack.xcgjaG/_new 2012-03-16 13:23:53.000000000 +0100 @@ -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 @@ -40,6 +39,7 @@ Version: 0.600.1 Release: 0 Source0: %{appname}-%{version}.tar.bz2 +Patch0: virtinst-git-suse-url.diff Patch10: virtinst-cdrom.diff Patch12: virtinst-storage-ocfs2.diff Patch13: virtinst-qed.diff @@ -53,7 +53,7 @@ Provides: virt-image Provides: virt-pack Provides: virt-convert -Requires: libvirt-python >= 0.4.5-2.fc10 +Requires: libvirt-python >= 0.4.5 Requires: libxml2-python Requires: python-urlgrabber %if 0%{suse_version} == 0 @@ -62,7 +62,7 @@ %endif BuildRequires: gettext BuildRequires: python-devel -Obsoletes: virt-manager <= 0.9.0 +Conflicts: virt-manager <= 0.9.0 %description pyhon-virtinst contains python modules and tools (virt-install, @@ -75,6 +75,7 @@ %prep %setup -q -n %{appname}-%{version} +%patch0 -p1 %patch10 -p1 %patch12 -p1 %patch13 -p1 ++++++ virtinst-git-suse-url.diff ++++++ Subject: SUSE URL installs want install= rather than method= From: Cole Robinson crobinso@redhat.com Thu Feb 9 10:41:18 2012 -0500 Date: Thu Feb 9 10:41:18 2012 -0500: Git: 8f02eecd41130dd8b20a80f589d0f67f718484d2 Index: virtinst-0.600.1/virtinst/OSDistro.py =================================================================== --- virtinst-0.600.1.orig/virtinst/OSDistro.py +++ virtinst-0.600.1/virtinst/OSDistro.py @@ -240,6 +240,7 @@ class Distro: _hvm_kernel_paths = [] _xen_kernel_paths = [] uses_treeinfo = False + method_arg = "method" def __init__(self, uri, arch, vmtype=None, scratchdir=None): self.uri = uri @@ -373,7 +374,7 @@ class Distro: args = '' if not fetcher.location.startswith("/"): - args += "method=" + fetcher.location + args += "%s=%s" % (self.method_arg, fetcher.location) if guest.extraargs: args += " " + guest.extraargs @@ -655,6 +656,7 @@ class SuseDistro(Distro): name = "SUSE" os_type = "linux" + method_arg = "install" _boot_iso_paths = [ "boot/boot.iso" ] def __init__(self, uri, arch, vmtype=None, scratchdir=None): -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org