script/autobuild.py: mv find_git_root and gitroot to top
authorJoe Guo <joeg@catalyst.net.nz>
Fri, 3 May 2019 10:34:32 +0000 (22:34 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 10 May 2019 08:19:16 +0000 (08:19 +0000)
so the reset of the code can use gitroot directly.

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
script/autobuild.py

index 62d304f..aac42f4 100755 (executable)
@@ -31,6 +31,22 @@ os.environ["PYTHONUNBUFFERED"] = "1"
 # This speeds up testing remarkably.
 os.environ['TDB_NO_FSYNC'] = '1'
 
+
+def find_git_root():
+    '''get to the top of the git repo'''
+    p = os.getcwd()
+    while p != '/':
+        if os.path.isdir(os.path.join(p, ".git")):
+            return p
+        p = os.path.abspath(os.path.join(p, '..'))
+    return None
+
+
+gitroot = find_git_root()
+if gitroot is None:
+    raise Exception("Failed to find git root")
+
+
 cleanup_list = []
 
 builddirs = {
@@ -770,16 +786,6 @@ def cleanup():
         run_cmd("rm -rf %s" % d)
 
 
-def find_git_root():
-    '''get to the top of the git repo'''
-    p = os.getcwd()
-    while p != '/':
-        if os.path.isdir(os.path.join(p, ".git")):
-            return p
-        p = os.path.abspath(os.path.join(p, '..'))
-    return None
-
-
 def daemonize(logfile):
     pid = os.fork()
     if pid == 0:  # Parent
@@ -861,10 +867,6 @@ def push_to(push_url, push_branch="master"):
 
 def_testbase = os.getenv("AUTOBUILD_TESTBASE", "/memdisk/%s" % os.getenv('USER'))
 
-gitroot = find_git_root()
-if gitroot is None:
-    raise Exception("Failed to find git root")
-
 parser = OptionParser()
 parser.add_option("", "--tail", help="show output while running", default=False, action="store_true")
 parser.add_option("", "--keeplogs", help="keep logs", default=False, action="store_true")