[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Tue Mar 21 09:38:02 UTC 2017

The branch, master has been updated
       via  05b5af4 autobuild: Stop waf uninstall from removing test_tmpdir
      from  55546fe idmap_autorid: Use idmap_config_int


- Log -----------------------------------------------------------------
commit 05b5af4ae5fbc9b59c857468512858f73e5dea1b
Author: Martin Schwenke <martin at meltin.net>
Date:   Mon Mar 20 14:49:34 2017 +1100

    autobuild: Stop waf uninstall from removing test_tmpdir
    Most of the autobuild tasks run "make distcheck", which does a
    recursive "waf configure make install uninstall".  "waf uninstall"
    (via BuildContext.install() in Build.py) removes empty directories all
    the way up the directory tree.  This means that it removes
    test_tmpdir, if it is empty, and any empty directories above it.
    While this is arguably a waf bug, the simplest solution is to make
    test_tmpdir non-empty so it don't get removed.
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12703
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Tue Mar 21 10:37:08 CET 2017 on sn-devel-144


Summary of changes:
 script/autobuild.py | 5 +++++
 1 file changed, 5 insertions(+)

Changeset truncated at 500 lines:

diff --git a/script/autobuild.py b/script/autobuild.py
index 1e12d69..f60ce09 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -764,6 +764,11 @@ while True:
         run_cmd("rm -rf %s" % test_tmpdir, show=True)
+        # The waf uninstall code removes empty directories all the way
+        # up the tree.  Creating a file in test_tmpdir stops it from
+        # being removed.
+        run_cmd("touch %s" % os.path.join(test_tmpdir,
+                                          ".directory-is-not-empty"), show=True)
         run_cmd("stat %s" % test_tmpdir, show=True)
         run_cmd("stat %s" % testbase, show=True)
         run_cmd("git clone --recursive --shared %s %s" % (gitroot, test_master), show=True, dir=gitroot)

Samba Shared Repository

More information about the samba-cvs mailing list