From 4112e572aadbbc552749398010257be3a3ba802b Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Fri, 14 Aug 2015 13:09:57 +0200 Subject: Add a restore command to the SSH interface Implement a new command that can be used to restore deleted package bases without having to push a new commit. Signed-off-by: Lukas Fleischer --- git-interface/git-update.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'git-interface/git-update.py') diff --git a/git-interface/git-update.py b/git-interface/git-update.py index d2583859..5ff8b285 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -176,22 +176,25 @@ def die_commit(msg, commit): sys.stderr.write("error: {:s}\n".format(msg)) exit(1) -if len(sys.argv) != 4: - die("invalid arguments") - -refname = sys.argv[1] -sha1_old = sys.argv[2] -sha1_new = sys.argv[3] +repo = pygit2.Repository(repo_path) user = os.environ.get("AUR_USER") pkgbase = os.environ.get("AUR_PKGBASE") privileged = (os.environ.get("AUR_PRIVILEGED", '0') == '1') +if len(sys.argv) == 2 and sys.argv[1] == "restore": + if 'refs/heads/' + pkgbase not in repo.listall_references(): + die('{:s}: repository not found: {:s}'.format(sys.argv[1], pkgbase)) + refname = "refs/heads/master" + sha1_old = sha1_new = repo.lookup_reference('refs/heads/' + pkgbase).target +elif len(sys.argv) == 4: + refname, sha1_old, sha1_new = sys.argv[1:3] +else: + die("invalid arguments") + if refname != "refs/heads/master": die("pushing to a branch other than master is restricted") -repo = pygit2.Repository(repo_path) - db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, passwd=aur_db_pass, db=aur_db_name, unix_socket=aur_db_socket, buffered=True) @@ -291,7 +294,7 @@ if srcinfo_pkgbase != pkgbase: # Ensure that packages are neither blacklisted nor overwritten. cur.execute("SELECT ID FROM PackageBases WHERE Name = %s", [pkgbase]) -pkgbase_id = cur.fetchone()[0] +pkgbase_id = cur.fetchone()[0] if cur.rowcount == 1 else 0 cur.execute("SELECT Name FROM PackageBlacklist") blacklist = [row[0] for row in cur.fetchall()] -- cgit v1.2.3-24-g4f1b