monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] net.venge.monotone.contrib.usher: bfa7d8df4270


From: code
Subject: [Monotone-commits-diffs] net.venge.monotone.contrib.usher: bfa7d8df42704958e5b9ac8014ac9edcfee3df53
Date: Sun, 23 Jan 2011 22:43:48 GMT

revision:            bfa7d8df42704958e5b9ac8014ac9edcfee3df53
date:                2011-01-21T14:26:40
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.contrib.usher
changelog:
Make sure keys can be added even if usher isn't up and running.


manifest:
format_version "1"

new_manifest [6fbabd0e328459e1e14b78a99a64f1ef9cbe1609]

old_revision [fc4db6c86fb19fac75ff76257b8bd0fd27e5afa2]

patch "utils/usherctl.in"
 from [6c4313565f4d4686d74e224003b14865589691e6]
   to [051f6bb1f71a000a84c157fdf5228a83a5b64142]
============================================================
--- utils/usherctl.in	6c4313565f4d4686d74e224003b14865589691e6
+++ utils/usherctl.in	051f6bb1f71a000a84c157fdf5228a83a5b64142
@@ -584,9 +584,17 @@ addprojectkey () {
 	cut -f2 -d'"' | sed -e 's|^0\.0\.0\.0:\(.*\)$|127.0.0.1:\1|'`/"$name"
 
     # Send the public key to the project server
-    if ! eval $amtn --keydir "\"$aconfdir/keys\"" --key "$name-admin" \
-	automate remote --remote-stdio-host $listenaddr \
-	put_public_key "\"$key\"" 2> /tmp/mtn.$$.err; then
+    if ! (
+	    if status0; then
+		eval $amtn --keydir "\"$aconfdir/keys\"" --key "$name-admin" \
+		    automate remote --remote-stdio-host $listenaddr \
+		    put_public_key "\"$key\"" 2> /tmp/mtn.$$.err
+	    else
+		eval $amtn --keydir "\"$aconfdir/keys\"" --key "$name-admin" \
+		    --db "\"$confdir/database.mtn\"" \
+		    automate put_public_key "\"$key\"" 2> /tmp/mtn.$$.err
+	    fi
+	); then
 	echo >&2 "Couldn't add public key to remote server $listenaddr"
 	echo >&2 "------------"
 	cat >&2 /tmp/mtn.$$.err

reply via email to

[Prev in Thread] Current Thread [Next in Thread]