sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

autobuild: added --fix-whitespace option

Browse Source
This commit is contained in:
Andrew Tridgell 2010-09-25 16:18:00 -07:00
parent 5d5ae099d1
commit d9a0546666
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
script/autobuild.py
View File

@ -116,6 +116,7 @@ class builder:
class buildlist:
'''handle build of multiple directories'''
def __init__(self, tasklist, tasknames):
global tasks
self.tlist = []
self.tail_proc = None
if tasknames == ['pass']:
@ -214,7 +215,10 @@ def rebase_tree(url):
print("Rebasing on %s" % url)
run_cmd("git remote add -t master master %s" % url, show=True, dir=test_master)
run_cmd("git fetch master", show=True, dir=test_master)
run_cmd("git rebase master/master", show=True, dir=test_master)
if options.fix_whitespace:
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)
def push_to(url):
print("Pushing to %s" % url)
@ -244,6 +248,8 @@ parser.add_option("", "--push-master", help="push to %s on success" % samba_mast
default=False, action='store_true')
parser.add_option("", "--mark", help="add a Tested-By signoff before pushing",
default=False, action="store_true")
parser.add_option("", "--fix-whitespace", help="fix whitespace on rebase",
default=False, action="store_true")
(options, args) = parser.parse_args()