s3: sid->domain_sid in winbindd_samr sam_rids_to_names

[sfrench/samba-autobuild/.git] / script / land-remote.py

diff --git a/script/land-remote.py b/script/land-remote.py
index 4a9c3fac8e843f579a73717e9bc22e0ac4e10341..1009e6bd02bc3ee20143990057181936eb48f4d4 100755 (executable)
--- a/script/land-remote.py
+++ b/script/land-remote.py
@@ -37,13 +37,16 @@ parser.add_option("--fail-slowly", help="continue running tests even after one h
 if opts.email is None and os.getenv("EMAIL") is not None:
     opts.email = os.getenv("EMAIL")
 
+if opts.email:
+    print "Sending email to %s" % opts.email
+
 if not opts.foreground and not opts.email:
     print "Not running in foreground and --email not specified."
     sys.exit(1)
 
 if not opts.foreground and opts.push_master:
-    print "Unable to push to master when not running in foreground."
-    sys.exit(1)
+    print "Pushing to master, forcing run in foreground."
+    opts.foreground = True
 
 if not opts.remote_repo:
     print "%s$ mktemp -d" % opts.host
@@ -101,6 +104,8 @@ if opts.pushto:
     remote_args.append("--pushto=%s" % opts.pushto)
 if opts.push_master:
     remote_args.append("--push-master")
+if opts.fail_slowly:
+    remote_args.append("--fail-slowly")
 
 remote_args += extra_args
 print "%s$ %s" % (opts.host, " ".join(remote_args))