diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2010-10-03 00:04:59 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2010-10-03 00:04:59 +0200 |
commit | b9bef1fd3ff5952eec0f123e4cdd290cd41dca67 (patch) | |
tree | 7d07b9b0a38b0be3b3e898828966fba4ec579eb7 | |
parent | 22f633d09478fae37c1b77fb54b267d57a21a6d8 (diff) | |
download | samba-b9bef1fd3ff5952eec0f123e4cdd290cd41dca67.tar.gz samba-b9bef1fd3ff5952eec0f123e4cdd290cd41dca67.tar.bz2 samba-b9bef1fd3ff5952eec0f123e4cdd290cd41dca67.zip |
land-remote: Pass extra arguments on to land.
-rwxr-xr-x | script/land-remote.py | 5 | ||||
-rwxr-xr-x | script/land.py | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/script/land-remote.py b/script/land-remote.py index cb0d7da853..75f1b41915 100755 --- a/script/land-remote.py +++ b/script/land-remote.py @@ -7,7 +7,7 @@ import optparse import subprocess import sys -parser = optparse.OptionParser("autoland-remote [options]") +parser = optparse.OptionParser("autoland-remote [options] [trees...]") parser.add_option("--remote-repo", help="Location of remote repository (default: temporary repository)", type=str, default=None) parser.add_option("--host", help="Host to land on (SSH connection string)", type=str, default="sn-devel-104.sn.samba.org") parser.add_option("--foreground", help="Don't daemonize", action="store_true", default=False) @@ -24,7 +24,7 @@ parser.add_option("--fix-whitespace", help="fix whitespace on rebase", parser.add_option("--fail-slowly", help="continue running tests even after one has already failed", action="store_true") -(opts, args) = parser.parse_args() +(opts, extra_args) = parser.parse_args() if not opts.foreground and not opts.email: print "Not running in foreground and --email not specified." @@ -71,6 +71,7 @@ if opts.rebase: remote_args.append("--rebase=%s" % opts.rebase) if opts.passcmd: remote_args.append("--passcmd=%s" % opts.passcmd) +remote_args += extra_args print "%s$ %s" % (opts.host, " ".join(remote_args)) args = ["ssh", "-A", opts.host] + remote_args sys.exit(subprocess.call(args)) diff --git a/script/land.py b/script/land.py index 8f17c7c8c4..632f844558 100755 --- a/script/land.py +++ b/script/land.py @@ -201,7 +201,6 @@ class SubunitTreeStageBuilder(TreeStageBuilder): self.status = self.proc.poll() if self.status is not None: self.subunit.close() - import pdb; pdb.set_trace() return self.status |