[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  5ffacff autobuild: use killbysubdir if available
       via  cc79f09 autobuild: exit immediately if no changes from master
      from  065fc8b s3-waf: convert LIBGPO into a subsystem.

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


- Log -----------------------------------------------------------------
commit 5ffacff5c4a4799aacf97cbc28581f8e302c145c
Author: Andrew Tridgell <tridge at samba.org>
Date:   Sun Sep 26 12:50:06 2010 -0700

    autobuild: use killbysubdir if available
    
    this will reduce the spurious test output while processes are being
    killed

commit cc79f092ba098543d253884dc9dc2be3c30cd282
Author: Andrew Tridgell <tridge at samba.org>
Date:   Sun Sep 26 11:46:01 2010 -0700

    autobuild: exit immediately if no changes from master
    
    we don't need to test master in autobuild

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

Summary of changes:
 script/autobuild.py |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/script/autobuild.py b/script/autobuild.py
index f75ccd7..5d7228b 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -72,17 +72,22 @@ retry_task = [ '''set -e
                 done
                ''' % samba_master]
 
-def run_cmd(cmd, dir=".", show=None):
+def run_cmd(cmd, dir=".", show=None, output=False, checkfail=True):
     cwd = os.getcwd()
     os.chdir(dir)
     if show is None:
         show = options.verbose
     if show:
         print("Running: '%s' in '%s'" % (cmd, dir))
+    if output:
+        ret = Popen([cmd], shell=True, stdout=PIPE).communicate()[0]
+        os.chdir(cwd)
+        return ret
     ret = os.system(cmd)
     os.chdir(cwd)
-    if ret != 0:
+    if checkfail and ret != 0:
         raise Exception("FAILED %s: %d" % (cmd, ret))
+    return ret
 
 class builder:
     '''handle build of one directory'''
@@ -161,6 +166,7 @@ class buildlist:
             self.retry = None
         for b in self.tlist:
             if b.proc is not None:
+                run_cmd("killbysubdir %s > /dev/null 2>&1" % b.sdir, checkfail=False)
                 b.proc.terminate()
                 b.proc.wait()
                 b.proc = None
@@ -254,6 +260,10 @@ def rebase_tree(url):
         run_cmd("git rebase --whitespace=fix master/master", show=True, dir=test_master)
     else:
         run_cmd("git rebase master/master", show=True, dir=test_master)
+    diff = run_cmd("git --no-pager diff HEAD master/master", dir=test_master, output=True)
+    if diff == '':
+        print("No differences between HEAD and master/master - exiting")
+        sys.exit(0)
 
 def push_to(url):
     print("Pushing to %s" % url)


-- 
Samba Shared Repository