[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
       via  7dbc5bb ctdb-build: Fix RPM build
       via  e458bdd ctdb-build: Add WAFLOCK magic to manpages target
      from  2170f55 pidl:Python: use of pytalloc_GenericObject_reference*() for pyrpc_{ex,im}port_union() wrapping

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7dbc5bbd60b1c0f32366ad5373ed13aee17f7050
Author: Martin Schwenke <martin at meltin.net>
Date:   Sat Feb 25 13:04:45 2017 +1100

    ctdb-build: Fix RPM build
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12595
    
    It doesn't look like recursion works for appending scripting commands.
    Unroll the recursion instead.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>
    
    Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
    Autobuild-Date(master): Mon Feb 27 03:09:27 CET 2017 on sn-devel-144

commit e458bdd7d26bc9cd9749398130ae23227894773f
Author: Martin Schwenke <martin at meltin.net>
Date:   Sat Feb 25 05:51:00 2017 +1100

    ctdb-build: Add WAFLOCK magic to manpages target
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12595
    
    Without this a top-level "make dist" fails to build the CTDB manpages.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 ctdb/Makefile | 3 ++-
 ctdb/wscript  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/Makefile b/ctdb/Makefile
index 23ee780..10ac9ab 100644
--- a/ctdb/Makefile
+++ b/ctdb/Makefile
@@ -28,7 +28,8 @@ show_version:
 	@WAFLOCK=.tmplock $(WAF) show_version
 
 manpages:
-	$(WAF) manpages
+	touch .tmplock
+	WAFLOCK=.tmplock $(WAF) manpages
 
 dist:
 	touch .tmplock
diff --git a/ctdb/wscript b/ctdb/wscript
index 78319ec..4c8db60 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -1025,7 +1025,8 @@ def rpmonly(ctx):
 
 def rpm(ctx):
     import Scripting
-    Scripting.commands.append('dist')
+    Scripting.commands.append('manpages')
+    Scripting.commands.append('distonly')
     Scripting.commands.append('rpmonly')
 
 


-- 
Samba Shared Repository