Take the new doc out of the branch and into trunk

[nodemanager.git] / ticket.py

diff --git a/ticket.py b/ticket.py
index 62aeb6f..c45e865 100644 (file)
--- a/ticket.py
+++ b/ticket.py
@@ -12,8 +12,8 @@ GPG = '/usr/bin/gpg'
 
 def sign(data):
     """Return <data> signed with the default GPG key."""
-    msg = dumps((data,))
-    p = _popen_gpg('--armor', '--sign')
+    msg = dumps((data,), methodresponse = True)
+    p = _popen_gpg('--armor', '--sign', '--keyring', '/etc/planetlab/secring.gpg', '--no-default-keyring')
     p.stdin.write(msg)
     p.stdin.close()
     signed_msg = p.stdout.read()
@@ -37,4 +37,4 @@ def verify(signed_msg):
 
 def _popen_gpg(*args):
     """Return a Popen object to GPG."""
-    return Popen((GPG, '--batch', '--no-tty') + args, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+    return Popen((GPG, '--batch', '--no-tty') + args, stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True)