[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.9.6-1-6-g26881dc

[Guido Günther]

The following commit has been merged in the master branch:
commit 26881dce3fdcc0646f2425f09377c6eaf9e6b802
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Oct 30 16:33:45 2011 +0100

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

diff --git a/debian/patches/series b/debian/patches/series
index 47b92bf..4ba64af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ Disable-gnulib-s-test-nonplocking-pipe.sh.patch
 Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
 Disable-failing-virnetsockettest.patch
 debian/Don-t-require-gawk-for-a-simple-print-expression.patch
+upstream/Fix-storage-pool-source-comparison-to-avoid-comparin.patch
diff --git a/debian/patches/upstream/Fix-storage-pool-source-comparison-to-avoid-comparin.patch b/debian/patches/upstream/Fix-storage-pool-source-comparison-to-avoid-comparin.patch
new file mode 100644
index 0000000..5b10234
--- /dev/null
+++ b/debian/patches/upstream/Fix-storage-pool-source-comparison-to-avoid-comparin.patch
@@ -0,0 +1,29 @@
+From: "Daniel P. Berrange" <berrange at redhat.com>
+Date: Tue, 11 Oct 2011 11:26:59 +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 e893b2d..eb39198 100644
+--- a/src/conf/storage_conf.c
++++ b/src/conf/storage_conf.c
+@@ -1730,6 +1730,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) {
+-- 

-- 
Libvirt Debian packaging