X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ticket.py;h=a52be173be217c32f74c5fd54d055ec50faf30dd;hb=1926e74e4865032256cf5cebfe977ac9c3dd149a;hp=c45e8653925f47f0576ed39f1141fa55dd107a5e;hpb=7820ef492529a2c66b9cc5814c25707fdf4595fe;p=nodemanager.git

diff --git a/ticket.py b/ticket.py
index c45e865..a52be17 100644
--- a/ticket.py
+++ b/ticket.py
@@ -5,10 +5,16 @@ 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,
+                 stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True)
 
 def sign(data):
     """Return <data> signed with the default GPG key."""
@@ -30,11 +36,8 @@ def verify(signed_msg):
     msg = p.stdout.read()
     p.stdout.close()
     p.stderr.close()
-    if p.wait(): return None  # verification failed
+    if p.wait():
+        return None  # verification failed
     else:
         data, = loads(msg)[0]
         return data
-
-def _popen_gpg(*args):
-    """Return a Popen object to GPG."""
-    return Popen((GPG, '--batch', '--no-tty') + args, stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True)