Fix abort in virsh when specifying a connection URI

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=8

libvirt.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 25 11:41:23 MDT 2009 - jfehlig@novell.com
+
+- Fix abort in virsh when specifying a connection URI
+  vshdeinit-recurse.patch
+
 -------------------------------------------------------------------
 Wed Sep 23 11:10:37 MDT 2009 - jfehlig@novell.com
 

libvirt.spec

@@ -30,7 +30,7 @@
 %endif
 
 Name:           libvirt
-BuildRequires:  PolicyKit-devel bridge-utils cyrus-sasl-devel fdupes gettext gnutls-devel hal-devel iptables-devel libxml2-devel lvm2 ncurses-devel parted-devel pkg-config python-devel readline-devel util-linux xhtml-dtd
+BuildRequires:  bridge-utils cyrus-sasl-devel fdupes gettext gnutls-devel hal-devel iptables-devel libxml2-devel lvm2 ncurses-devel parted-devel pkg-config python-devel readline-devel util-linux xhtml-dtd device-mapper-devel
 %if %{with_xen}
 BuildRequires:  xen-devel
 %endif
@@ -86,15 +86,16 @@ Source1:        libvirtd.init
 # Upstream patches
 Patch0:         devmap-no-pkgconfig.patch
 # Need to go upstream
-Patch1:         socat.patch
+Patch100:       socat.patch
-Patch2:         clone.patch
+Patch101:       clone.patch
-Patch3:         migrate-params.patch
+Patch102:       migrate-params.patch
-Patch4:         xen-pv-cdrom.patch
+Patch103:       xen-pv-cdrom.patch
-Patch5:         detach-disk.patch
+Patch104:       detach-disk.patch
+Patch105:       vshdeinit-recurse.patch
 # Our patches
-Patch6:         libvirtd-defaults.patch
+Patch200:       libvirtd-defaults.patch
-Patch7:         suse-network.patch
+Patch201:       suse-network.patch
-Patch8:         snapshots.patch
+Patch202:       snapshots.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -188,14 +189,15 @@ Authors:
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+%patch100 -p1
-%patch2 
+%patch101 
-%patch3 -p1
+%patch102 -p1
-%patch4 -p1
+%patch103 -p1
-%patch5 -p1
+%patch104 -p1
-%patch6 -p1
+%patch105 -p1
-%patch7 -p1
+%patch200 -p1
-%patch8 -p1
+%patch201 -p1
+%patch202 -p1
 
 %build
 %if ! %{with_xen}

vshdeinit-recurse.patch

@@ -0,0 +1,13 @@
+Index: libvirt-0.7.1/src/virsh.c
+===================================================================
+--- libvirt-0.7.1.orig/src/virsh.c
++++ libvirt-0.7.1/src/virsh.c
+@@ -8201,7 +8201,7 @@ vshError(vshControl *ctl, int doexit, co
+     fputc('\n', stderr);
+ 
+     if (doexit) {
+-        if (ctl)
++        if (ctl->conn)
+             vshDeinit(ctl);
+         exit(EXIT_FAILURE);
+     }