[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.7_rc1-2

[Guido Günther]

The following commit has been merged in the experimental branch:
commit 764a29cbaa54fa31a8cc00a57d7a2f20914f8188
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Nov 2 19:06:36 2011 +0100

    New patch Fix-storage-pool-source-comparison-to-avoid-comparin.patch
    
    Fix storage pool source comparison to avoid comparing with self
    Thanks: "Daniel P. Berrange"

diff --git a/debian/patches/Fix-storage-pool-source-comparison-to-avoid-comparin.patch b/debian/patches/Fix-storage-pool-source-comparison-to-avoid-comparin.patch
new file mode 100644
index 0000000..39dc785
--- /dev/null
+++ b/debian/patches/Fix-storage-pool-source-comparison-to-avoid-comparin.patch
@@ -0,0 +1,28 @@
+From: "Daniel P. Berrange" <berrange at redhat.com>
+Date: Fri, 7 Oct 2011 17:38:09 +0100
+Subject: Fix storage pool source comparison to avoid comparing with self
+
+If we are comparing storage pools we must skip comparing with
+ourself, so that re-defining an existing pool works
+
+* conf/storage_conf.c: Skip self when comparing
+---
+ src/conf/storage_conf.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
+index 18cbfdb..dadc115 100644
+--- a/src/conf/storage_conf.c
++++ b/src/conf/storage_conf.c
+@@ -1711,6 +1711,10 @@ int virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools,
+         if (def->type != pool->def->type)
+             continue;
+ 
++        /* Don't mach against ourself if re-defining existing pool ! */
++        if (STREQ(pool->def->name, def->name))
++            continue;
++
+         virStoragePoolObjLock(pool);
+ 
+         switch (pool->def->type) {
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 24805f9..9124e2c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,5 @@ Disable-daemon-start-test.patch
 Disable-gnulib-s-test-nonplocking-pipe.sh.patch
 Disable-failing-virnetsockettest.patch
 debian/Don-t-require-gawk-for-a-simple-print-expression.patch
+Skip-socket-test-if-we-exceed-UNIX_PATH_MAX.patch
+Fix-storage-pool-source-comparison-to-avoid-comparin.patch

-- 
Libvirt Debian packaging