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

[Guido Günther]

The following commit has been merged in the master branch:
commit 2ce785559edf684c70eb371726f2bbffa9ba53df
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Oct 30 17:01:52 2011 +0100

    Revert "Fix storage pool source comparison to avoid comparing with self"
    
    This reverts commit 26881dce3fdcc0646f2425f09377c6eaf9e6b802.

diff --git a/debian/patches/series b/debian/patches/series
index 4ba64af..47b92bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,3 @@ 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
deleted file mode 100644
index 5b10234..0000000
--- a/debian/patches/upstream/Fix-storage-pool-source-comparison-to-avoid-comparin.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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