[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  18c0d87 build: skip shipping the alpha13 provision in the release tarballs
       via  2dd0e71 s4-classicupgrade: Show more clearly what is wrong with the Adminstrator SID
       via  3b3d7bb build: Only make bin/ if it does not exist
       via  3ad9c52 selftest: skip tests if the tarball did not include the alpha13 provision
      from  05f9829 waf: add new quota header checks and sysquota_4B source file

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


- Log -----------------------------------------------------------------
commit 18c0d872d119f47f3f82f6fa1f4fa8a2afc36750
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Sep 3 18:55:06 2012 +1000

    build: skip shipping the alpha13 provision in the release tarballs
    
    This test is important, but it is not important enough to include this volume of data
    in every tarball.
    
    Andrew Bartlett
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Mon Sep  3 13:01:58 CEST 2012 on sn-devel-104

commit 2dd0e7141f24a4e92e165c3aadaaa3a97eb26712
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Sep 3 18:50:16 2012 +1000

    s4-classicupgrade: Show more clearly what is wrong with the Adminstrator SID

commit 3b3d7bb6029bf7c89abec0fb0b455a6154b0d0bf
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Sep 3 18:43:33 2012 +1000

    build: Only make bin/ if it does not exist

commit 3ad9c52b1471da7192aa39f878d3ec22ea52d665
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Sep 3 18:42:55 2012 +1000

    selftest: skip tests if the tarball did not include the alpha13 provision

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

Summary of changes:
 source4/scripting/python/samba/upgrade.py |    1 +
 testprogs/blackbox/dbcheck-alpha13.sh     |   34 +++++++++++++++++++++++-----
 wscript                                   |    5 ++-
 3 files changed, 32 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index d3f0b8d..6b6a188 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -869,6 +869,7 @@ Please fix this account before attempting to upgrade again
     for username in userdata:
         if username.lower() == 'administrator':
             if userdata[username].user_sid != dom_sid(str(domainsid) + "-500"):
+                logger.error("User 'Administrator' in your existing directory has SID %s, expected it to be %s" % (userdata[username].user_sid, dom_sid(str(domainsid) + "-500")))
                 raise ProvisioningError("User 'Administrator' in your existing directory does not have SID ending in -500")
         if username.lower() == 'root':
             if userdata[username].user_sid == dom_sid(str(domainsid) + "-500"):
diff --git a/testprogs/blackbox/dbcheck-alpha13.sh b/testprogs/blackbox/dbcheck-alpha13.sh
index 00cb97a..a028116 100755
--- a/testprogs/blackbox/dbcheck-alpha13.sh
+++ b/testprogs/blackbox/dbcheck-alpha13.sh
@@ -12,12 +12,14 @@ shift 1
 
 . `dirname $0`/subunit.sh
 
+alpha13_dir=`dirname $0`/../../source4/selftest/provisions/alpha13
+
 alpha13() {
        if test -x $BINDIR/tdbrestore;
        then
-	`dirname $0`/../../source4/selftest/provisions/undump.sh `dirname $0`/../../source4/selftest/provisions/alpha13 $PREFIX_ABS/alpha13 $BINDIR/tdbrestore
+	`dirname $0`/../../source4/selftest/provisions/undump.sh $alpha13_dir $PREFIX_ABS/alpha13 $BINDIR/tdbrestore
        else 
-	`dirname $0`/../../source4/selftest/provisions/undump.sh `dirname $0`/../../source4/selftest/provisions/alpha13 $PREFIX_ABS/alpha13
+	`dirname $0`/../../source4/selftest/provisions/undump.sh $alpha13_dir $PREFIX_ABS/alpha13
        fi
 }
 
@@ -34,9 +36,29 @@ dbcheck_clean() {
        $BINDIR/samba-tool dbcheck --cross-ncs -H tdb://$PREFIX_ABS/alpha13/private/sam.ldb $@
 }
 
-testit "alpha13" alpha13
-testit "reindex" reindex
-testit_expect_failure "dbcheck" dbcheck
-testit "dbcheck_clean" dbcheck_clean
+if [ -d $alpha13_dir ]; then
+    testit "alpha13" alpha13
+    testit "reindex" reindex
+    testit_expect_failure "dbcheck" dbcheck
+    testit "dbcheck_clean" dbcheck_clean
+else
+    subunit_start_test "alpha13"
+    subunit_skip_test "alpha13" <<EOF 
+no test provision 
+EOF
+
+    subunit_start_test "reindex"
+    subunit_skip_test "reindex" <<EOF 
+no test provision 
+EOF
+    subunit_start_test "dbcheck"
+    subunit_skip_test "dbcheck" <<EOF 
+no test provision 
+EOF
+    subunit_start_test "dbcheck_clean"
+    subunit_skip_test "dbcheck_clean" <<EOF 
+no test provision 
+EOF
+fi
 
 exit $failed
diff --git a/wscript b/wscript
index fcf4a0f..64aaaf2 100755
--- a/wscript
+++ b/wscript
@@ -12,7 +12,7 @@ import wafsamba, Options, samba_dist, Scripting, Utils, samba_version
 
 
 samba_dist.DIST_DIRS('.')
-samba_dist.DIST_BLACKLIST('.gitignore .bzrignore')
+samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions/alpha13')
 
 # install in /usr/local/samba by default
 Options.default_prefix = '/usr/local/samba'
@@ -239,7 +239,8 @@ def dist():
 
     if sambaversion.IS_SNAPSHOT:
         # write .distversion file and add to tar
-        os.makedirs(blddir)
+        if not os.path.isdir(blddir):
+            os.makedirs(blddir)
         distversionf = tempfile.NamedTemporaryFile(mode='w', prefix='.distversion',dir=blddir)
         for field in sambaversion.vcs_fields:
             distveroption = field + '=' + str(sambaversion.vcs_fields[field])


-- 
Samba Shared Repository