[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/1.0.1-1

[Guido Günther]

The following commit has been merged in the experimental branch:
commit 1384de7b64ab45fa13330723cc278a88c1202910
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Dec 23 12:27:19 2012 +0100

    Dropped patches
    
      * Define-SANLK_INQ_WAIT-if-missing-in-headers.patch - fixed upstream

diff --git a/debian/patches/Define-SANLK_INQ_WAIT-if-missing-in-headers.patch b/debian/patches/Define-SANLK_INQ_WAIT-if-missing-in-headers.patch
index 5ac4871..d070305 100644
--- a/debian/patches/Define-SANLK_INQ_WAIT-if-missing-in-headers.patch
+++ b/debian/patches/Define-SANLK_INQ_WAIT-if-missing-in-headers.patch
@@ -8,16 +8,16 @@ so we can build with older sanlock (like 2.2)
  1 file changed, 3 insertions(+)
 
 diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
-index 430e11e..84f81ec 100644
+index a072343..fe3a52f 100644
 --- a/src/locking/lock_driver_sanlock.c
 +++ b/src/locking/lock_driver_sanlock.c
-@@ -338,6 +338,9 @@ retry:
+@@ -334,6 +334,9 @@ retry:
      if ((rv = sanlock_add_lockspace(&ls, 0)) < 0) {
-         if (-rv == EINPROGRESS) {
+         if (-rv == EINPROGRESS && --retries) {
  #ifdef HAVE_SANLOCK_INQ_LOCKSPACE
 +#  ifndef SANLK_INQ_WAIT
 +#    define SANLK_INQ_WAIT 0x00000001
 +#  endif
              /* we have this function which blocks until lockspace change the
               * state. It returns 0 if lockspace has been added, -ENOENT if it
-              * hasn't. XXX should we goto retry? */
+              * hasn't. */
diff --git a/debian/patches/series b/debian/patches/series
index 2e489b5..6148614 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,3 @@ Don-t-fail-if-we-can-t-setup-avahi.patch
 Reduce-udevadm-settle-timeout-to-10-seconds.patch
 debian/Debianize-systemd-service-files.patch
 Allow-xen-toolstack-to-find-it-s-binaries.patch
-Define-SANLK_INQ_WAIT-if-missing-in-headers.patch

-- 
Libvirt Debian packaging