pld-builder.new: PLD_Builder/gpg.py - catch missing gpg binary error early

[glen]

Author: glen                         Date: Tue Jul 15 11:26:08 2008 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- catch missing gpg binary error early

---- Files affected:
pld-builder.new/PLD_Builder:
   gpg.py (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/gpg.py
diff -u pld-builder.new/PLD_Builder/gpg.py:1.17 pld-builder.new/PLD_Builder/gpg.py:1.18
--- pld-builder.new/PLD_Builder/gpg.py:1.17	Tue Jul 15 13:12:00 2008
+++ pld-builder.new/PLD_Builder/gpg.py	Tue Jul 15 13:26:03 2008
@@ -6,6 +6,7 @@
 import StringIO
 
 import util
+import os
 import pipeutil
 
 def __gpg_close(descriptors):
@@ -21,7 +22,11 @@
     object.
     """
 
-    gpg_run = popen2.Popen3("gpg --batch --no-tty --decrypt", True)
+    if not os.path.isfile('/usr/bin/gpg'):
+        log.error("missing gnupg binary: /usr/bin/gpg")
+        raise OSError, 'Missing gnupg binary'
+
+    gpg_run = popen2.Popen3("/usr/bin/gpg --batch --no-tty --decrypt", True)
     try:
         body = pipeutil.rw_pipe(buf, gpg_run.tochild, gpg_run.fromchild)
     except OSError, e:
@@ -41,7 +46,11 @@
     return (emails, body)
 
 def sign(buf):
-    gpg_run  = popen2.Popen3("gpg --batch --no-tty --clearsign", True)
+    if not os.path.isfile('/usr/bin/gpg'):
+        log.error("missing gnupg binary: /usr/bin/gpg")
+        raise OSError, 'Missing gnupg binary'
+
+    gpg_run  = popen2.Popen3("/usr/bin/gpg --batch --no-tty --clearsign", True)
     try:
         body = pipeutil.rw_pipe(buf, gpg_run.tochild, gpg_run.fromchild)
     except OSError, e:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/gpg.py?r1=1.17&r2=1.18&f=u