Whack with club until builds work with new repository and scripts.

1 files changed, 7 insertions, 5 deletions

diff --git a/rpki-pbuilder.py b/rpki-pbuilder.py
index 4ae0823..942782e 100644
--- a/rpki-pbuilder.py
+++ b/rpki-pbuilder.py
@@ -51,8 +51,6 @@ parser.add_argument("--git-tree", default = os.path.expanduser("~/source/master/
                     help = "git tree")
 parser.add_argument("--apt-tree", default = os.path.expanduser("~/repository/"),
                     help = "reprepro repository")
-parser.add_argument("--apt-user", default = "aptbot",
-                    help = "username for uploading apt repository to public web server")
 parser.add_argument("--url-host", default = "download.rpki.net",
                     help = "hostname of public web server")
 parser.add_argument("--url-scheme", default = "http",
@@ -103,7 +101,7 @@ except (IOError, OSError), e:
     sys.exit(0 if e.errno == errno.EAGAIN else "Error {!r} opening lock {!r}".format(e, args.lockfile))
 
 run("git", "fetch", "--all", "--prune", cwd = args.git_tree)
-run("git", "pull", cwd = args.git_tree)
+run("git", "pull",                      cwd = args.git_tree)
 
 source_version = subprocess.check_output((sys.executable, os.path.join(args.git_tree, "buildtools/make-version.py"),
                                           "--build-tag", "--stdout"), cwd = args.git_tree).strip()
@@ -334,12 +332,16 @@ for r in args.releases:
 
 Release.do_all_releases()
 
+# Push any tags created above to the public git repository.
+
+if upload:
+    run("git", "push", "--tags", cwd = args.git_tree)
+
 # Upload results, maybe.  We do this in two stages, to minimize the window
 # during which the uploaded repository might be in an inconsistent state.
 
 def rsync(*flags):
-    cmd = ["rsync", "--archive", "--itemize-changes",
-           "--rsh", "ssh -l {}".format(args.apt_user)]
+    cmd = ["rsync", "--archive", "--itemize-changes", "--rsh", "ssh"]
     cmd.extend(flags)
     cmd.append(args.apt_tree)
     cmd.append("rsync://{host}/{path}/".format(host = args.url_host,