summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-10-01 19:24:20 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-10-02 13:14:51 +0200
commit56ad550a92c9c0c65da52861e43ed7595131d0ef (patch)
tree918440366e345e6af477224ffa8358a0fe6116b0
parentff5fdb65f54f2e2efd865112f579989e96d848cf (diff)
downloadsamba-56ad550a92c9c0c65da52861e43ed7595131d0ef.tar.gz
samba-56ad550a92c9c0c65da52861e43ed7595131d0ef.tar.bz2
samba-56ad550a92c9c0c65da52861e43ed7595131d0ef.zip
land-remote: Checkout repository first.
-rwxr-xr-xscript/land-remote.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/script/land-remote.py b/script/land-remote.py
index 705b408bd9..14f32357f9 100755
--- a/script/land-remote.py
+++ b/script/land-remote.py
@@ -36,6 +36,7 @@ if not opts.remote_repo:
sys.exit(1)
remote_repo = stdout.rstrip()
print "Remote tempdir: %s" % remote_repo
+ # Bootstrap, git.samba.org is close to sn-devel
remote_args = ["git", "clone", "git://git.samba.org/samba.git", remote_repo]
#remote_args = ["git", "init", remote_repo]
print "%s$ %s" % (opts.host, " ".join(remote_args))
@@ -44,10 +45,10 @@ else:
remote_repo = opts.remote_repo
print "Pushing local branch"
-args = ["git", "push", "--force", "git+ssh://%s/%s" % (opts.host, remote_repo), "HEAD:HEAD"]
+args = ["git", "push", "--force", "git+ssh://%s/%s" % (opts.host, remote_repo), "HEAD:land"]
print "$ " + " ".join(args)
subprocess.check_call(args)
-remote_args = ["python", "%s/script/land.py" % remote_repo, "--repository=%s" % remote_repo]
+remote_args = ["cd", remote_repo, ";", "git", "checkout", "land", ";", "python", "./script/land.py", "--repository=%s" % remote_repo]
if opts.email:
remote_args.append("--email=%s" % opts.email)
if opts.always_email: