reguire gnupg1 on f>=31; sense the system to use gpg1 when installed

[nodemanager.git] / ticket.py

diff --git a/ticket.py b/ticket.py
index aa24b88..a52be17 100644 (file)
--- a/ticket.py
+++ b/ticket.py
@@ -1,6 +1,3 @@
-# $Id$
-# $URL$
-
 """An extremely simple interface to the signing/verifying capabilities
 of gnupg.
 
@@ -8,13 +5,15 @@ You must already have the key in the keyring.
 """
 
 from subprocess import PIPE, Popen
-from xmlrpclib import dumps, loads
+from xmlrpc.client import dumps, loads
 
-GPG = '/usr/bin/gpg'
+# see also myplc/plc.d/gpg
+import os.path
+GPG = '/usr/bin/gpg1' if os.path.exists("/usr/bin/gpg1") else "/usr/bin/gpg"
 
 def _popen_gpg(*args):
     """Return a Popen object to GPG."""
-    return Popen((GPG, '--batch', '--no-tty') + args, 
+    return Popen((GPG, '--batch', '--no-tty') + args,
                  stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True)
 
 def sign(data):
@@ -37,9 +36,8 @@ def verify(signed_msg):
     msg = p.stdout.read()
     p.stdout.close()
     p.stderr.close()
-    if p.wait(): 
+    if p.wait():
         return None  # verification failed
     else:
         data, = loads(msg)[0]
         return data
-