[Pkg-samba-maint] [samba] 01/01: Fix socketpath parsing

[Mathieu Parent]

This is an automated email from the git hooks/post-receive script.

sathieu pushed a commit to branch experimental
in repository samba.

commit 05aaa71c737b037bc97b547f14ccbd859824f439
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Wed Jun 17 21:52:36 2015 +0200

    Fix socketpath parsing
---
 ctdb/wscript                       |  2 +-
 debian/patches/ctdb_sockpath.patch | 13 +++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ctdb/wscript b/ctdb/wscript
index 3e2a992..2239e1f 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -60,7 +60,7 @@ def set_options(opt):
                    action="store", dest='ctdb_logdir', default=None)
     opt.add_option('--with-socketpath',
                    help=("path to CTDB daemon socket"),
-                   action="store_true", dest='ctdb_sockpath', default=False)
+                   action="store", dest='ctdb_sockpath', default=None)
 
 
 def configure(conf):
diff --git a/debian/patches/ctdb_sockpath.patch b/debian/patches/ctdb_sockpath.patch
new file mode 100644
index 0000000..19a2946
--- /dev/null
+++ b/debian/patches/ctdb_sockpath.patch
@@ -0,0 +1,13 @@
+diff --git a/ctdb/wscript b/ctdb/wscript
+index 3e2a992..2239e1f 100755
+--- a/ctdb/wscript
++++ b/ctdb/wscript
+@@ -60,7 +60,7 @@ def set_options(opt):
+                    action="store", dest='ctdb_logdir', default=None)
+     opt.add_option('--with-socketpath',
+                    help=("path to CTDB daemon socket"),
+-                   action="store_true", dest='ctdb_sockpath', default=False)
++                   action="store", dest='ctdb_sockpath', default=None)
+ 
+ 
+ def configure(conf):
diff --git a/debian/patches/series b/debian/patches/series
index 2c94eed..c50006d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ add-so-version-to-private-libraries
 xsltproc_dont_build_smb.conf.5.patch
 heimdal-rfc3454.txt
 no_wrapper
+ctdb_sockpath.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git