[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  3cd558d talloc: Fix #include line in manpage.
       via  6d8b3ef land: Use temp dir if /memdisk is not available.
      from  2d2dbf5 s4-test-msds_intid: Verify ATTIDs for Linked Attributes

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


- Log -----------------------------------------------------------------
commit 3cd558dbeb2c543895847d4c5e21fe1f7f779a8c
Author: Jelmer Vernooij <jel...@samba.org>
Date:   Sat Oct 9 15:11:14 2010 +0200

    talloc: Fix #include line in manpage.
    
    Autobuild-User: Jelmer Vernooij <jel...@samba.org>
    Autobuild-Date: Sat Oct  9 13:53:25 UTC 2010 on sn-devel-104

commit 6d8b3efadb07dc86c812471a69e57f6d05fdb0fd
Author: Jelmer Vernooij <jel...@samba.org>
Date:   Wed Oct 6 18:10:42 2010 +0200

    land: Use temp dir if /memdisk is not available.

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

Summary of changes:
 lib/talloc/talloc.3.xml |    2 +-
 script/land.py          |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/talloc/talloc.3.xml b/lib/talloc/talloc.3.xml
index c23b911..1d5476b 100644
--- a/lib/talloc/talloc.3.xml
+++ b/lib/talloc/talloc.3.xml
@@ -10,7 +10,7 @@
 <refpurpose>hierarchical reference counted memory pool system with 
destructors</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
-<synopsis>#include &lt;talloc/talloc.h&gt;</synopsis>
+<synopsis>#include &lt;talloc.h&gt;</synopsis>
   </refsynopsisdiv>
   <refsect1><title>DESCRIPTION</title>
     <para>
diff --git a/script/land.py b/script/land.py
index 6b25134..4b7d1ca 100755
--- a/script/land.py
+++ b/script/land.py
@@ -16,6 +16,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), 
"../lib/subunit/pytho
 import subunit
 import testtools
 import subunithelper
+import tempfile
 from email.mime.application import MIMEApplication
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
@@ -511,7 +512,12 @@ def push_to(url):
     run_cmd(["git", "push", "pushto", "+HEAD:master"], show=True,
         dir=test_master)
 
-def_testbase = os.getenv("AUTOBUILD_TESTBASE", "/memdisk/%s" % 
os.getenv('USER'))
+def_testbase = os.getenv("AUTOBUILD_TESTBASE")
+if def_testbase is None:
+    if os.path.exists("/memdisk"):
+        def_testbase = "/memdisk/%s" % os.getenv('USER')
+    else:
+        def_testbase = os.path.join(tempfile.gettempdir(), "autobuild-%s" % 
os.getenv("USER"))
 
 parser = OptionParser()
 parser.add_option("--repository", help="repository to run tests for", 
default=None, type=str)


-- 
Samba Shared Repository