Merge branch 'tokens'

* tokens:
  Correctly tokenize output to admin clients.

diff --git a/tripe-keys.in b/tripe-keys.in
index a3e5b141a91acba0c616419cb4475df10d6b7f25..6da6eb4a0c008d346a14e647e7aa922a02b0eb7a 100644 (file)
--- a/tripe-keys.in
+++ b/tripe-keys.in
@@ -290,8 +290,8 @@ def cmd_update(args):
     OS.mkdir('tmp')
     OS.chdir('tmp')
     seq = int(conf['master-sequence'])
-    run('wget -q -O tripe-keys.tar.gz ${repos-url}')
-    run('wget -q -O tripe-keys.sig %s' % seqsubst('sig-url', seq))
+    run('curl -s -o tripe-keys.tar.gz ${repos-url}')
+    run('curl -s -o tripe-keys.sig %s' % seqsubst('sig-url', seq))
     run('tar xfz tripe-keys.tar.gz')
 
     ## Verify the signature