summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-09-25 16:18:00 -0700
committerAndrew Tridgell <tridge@samba.org>2010-09-26 01:21:49 +0000
commitd9a0546666c4628dbf577c6525ad64f3ee3ef077 (patch)
treee53d324722c8ab6873abf7f91da64c883a63e06f
parent5d5ae099d16d1902e4a85adec5b1e6a9085b6118 (diff)
downloadsamba-d9a0546666c4628dbf577c6525ad64f3ee3ef077.tar.gz
samba-d9a0546666c4628dbf577c6525ad64f3ee3ef077.tar.bz2
samba-d9a0546666c4628dbf577c6525ad64f3ee3ef077.zip
autobuild: added --fix-whitespace option
-rwxr-xr-xscript/autobuild.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/script/autobuild.py b/script/autobuild.py
index a1b45906a9..ec9998950f 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -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()