pld-builder.new: PLD_Builder/gpg.py Close in order described by ht...

arekm arekm at pld-linux.org
Tue Nov 20 22:15:29 CET 2007


Author: arekm                        Date: Tue Nov 20 21:15:29 2007 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
Close in order described by http://docs.python.org/lib/popen2-flow-control.html

---- Files affected:
pld-builder.new/PLD_Builder:
   gpg.py (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/gpg.py
diff -u pld-builder.new/PLD_Builder/gpg.py:1.14 pld-builder.new/PLD_Builder/gpg.py:1.15
--- pld-builder.new/PLD_Builder/gpg.py:1.14	Tue Nov 20 21:56:26 2007
+++ pld-builder.new/PLD_Builder/gpg.py	Tue Nov 20 22:15:24 2007
@@ -25,7 +25,7 @@
     try:
         body = pipeutil.rw_pipe(buf, gpg_in, gpg_out)
     except OSError, e:
-        __gpg_close([gpg_out, gpg_in, gpg_err])
+        __gpg_close([gpg_out, gpg_err, gpg_in])
         log.error("gnupg signing failed, does gpg binary exist? : %s" % e)
         raise
 
@@ -35,7 +35,7 @@
         m = rx.match(l)
         if m:
             emails.append(m.group(2))
-    __gpg_close([gpg_out, gpg_in, gpg_err])
+    __gpg_close([gpg_out, gpg_err, gpg_in])
     return (emails, body)
 
 def sign(buf):
@@ -43,9 +43,9 @@
     try:
         body = pipeutil.rw_pipe(buf, gpg_in, gpg_out)
     except OSError, e:
-        __gpg_close([gpg_out, gpg_in, gpg_err])
+        __gpg_close([gpg_out, gpg_err, gpg_in])
         log.error("gnupg signing failed, does gpg binary exist? : %s" % e)
         raise
 
-    __gpg_close([gpg_out, gpg_in, gpg_err])
+    __gpg_close([gpg_out, gpg_err, gpg_in])
     return body
================================================================

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



More information about the pld-cvs-commit mailing list