sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

script/autobuild.py: mv find_git_root and gitroot to top

Browse Source 
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>
This commit is contained in:
Joe Guo 2019-05-03 22:34:32 +12:00 committed by Andrew Bartlett
parent af0e0c544b
commit 9ea81c0e37
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
script/autobuild.py
View File

@ -31,6 +31,22 @@ os.environ["PYTHONUNBUFFERED"] = "1"
# This speeds up testing remarkably. # This speeds up testing remarkably.
os.environ['TDB_NO_FSYNC'] = '1' 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 = [] cleanup_list = []
builddirs = { builddirs = {
@ -770,16 +786,6 @@ def cleanup():
run_cmd("rm -rf %s" % d) 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): def daemonize(logfile):
pid = os.fork() pid = os.fork()
if pid == 0: # Parent 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')) 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 = OptionParser()
parser.add_option("", "--tail", help="show output while running", default=False, action="store_true") 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") parser.add_option("", "--keeplogs", help="keep logs", default=False, action="store_true")