pld-builder.new: PLD_Builder/bqueue.py, PLD_Builder/gpg.py, PLD_Builder/not...

[arekm]

Author: arekm                        Date: Fri Feb  6 14:02:26 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
Missing I/O->buf changes.

---- Files affected:
pld-builder.new/PLD_Builder:
   bqueue.py (1.10 -> 1.11) , gpg.py (1.20 -> 1.21) , notify.py (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/bqueue.py
diff -u pld-builder.new/PLD_Builder/bqueue.py:1.10 pld-builder.new/PLD_Builder/bqueue.py:1.11
--- pld-builder.new/PLD_Builder/bqueue.py:1.10	Fri Feb  6 11:35:52 2009
+++ pld-builder.new/PLD_Builder/bqueue.py	Fri Feb  6 15:02:21 2009
@@ -40,7 +40,7 @@
             f = gzip.open(self.name)
         else:
             f = open(self.name)
-        (signers, body) = gpg.verify_sig(f)
+        (signers, body) = gpg.verify_sig(f.read())
         self.signers = signers
         self.requests = request.parse_requests(body)
 
@@ -92,7 +92,7 @@
         sio = StringIO.StringIO()
         self._write_to(sio)
         sio.seek(0)
-        sio = gpg.sign(sio)
+        sio = gpg.sign(sio.read())
         if os.access(name, os.F_OK): os.unlink(name)
         if re.search(r"\.gz$", name):
             f = gzip.open(name, "w", 6)

================================================================
Index: pld-builder.new/PLD_Builder/gpg.py
diff -u pld-builder.new/PLD_Builder/gpg.py:1.20 pld-builder.new/PLD_Builder/gpg.py:1.21
--- pld-builder.new/PLD_Builder/gpg.py:1.20	Fri Feb  6 11:35:52 2009
+++ pld-builder.new/PLD_Builder/gpg.py	Fri Feb  6 15:02:21 2009
@@ -23,7 +23,7 @@
     cmd = ['/usr/bin/gpg', '--batch', '--no-tty', '--decrypt']
     gpg_run = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
     try:
-        d_stdout, d_stderr = gpg_run.communicate(buf.read())
+        d_stdout, d_stderr = gpg_run.communicate(buf)
     except OSError, e:
         log.error("gnupg run, does gpg binary exist? : %s" % e)
         raise
@@ -55,7 +55,7 @@
     cmd = ['/usr/bin/gpg', '--batch', '--no-tty', '--decrypt']
     gpg_run = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
     try:
-        d_stdout, d_stderr = gpg_run.communicate(buf.read())
+        d_stdout, d_stderr = gpg_run.communicate(buf)
     except OSError, e:
         log.error("gnupg run failed, does gpg binary exist? : %s" % e)
         raise
@@ -78,7 +78,7 @@
     cmd = ['/usr/bin/gpg', '--batch', '--no-tty', '--clearsign']
     gpg_run = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
     try:
-        d_stdout, d_stderr = gpg_run.communicate(buf.read())
+        d_stdout, d_stderr = gpg_run.communicate(buf)
     except OSError, e:
         log.error("gnupg signing failed, does gpg binary exist? : %s" % e)
         raise

================================================================
Index: pld-builder.new/PLD_Builder/notify.py
diff -u pld-builder.new/PLD_Builder/notify.py:1.6 pld-builder.new/PLD_Builder/notify.py:1.7
--- pld-builder.new/PLD_Builder/notify.py:1.6	Fri Feb  6 11:35:52 2009
+++ pld-builder.new/PLD_Builder/notify.py	Fri Feb  6 15:02:21 2009
@@ -18,7 +18,7 @@
         sio = StringIO.StringIO()
         self.xml.write("</notification>\n")
         self.xml.seek(0)
-        sio.write(gpg.sign(self.xml))
+        sio.write(gpg.sign(self.xml.read()))
         self.xml = None
         sio.seek(0)
         notifyq.init(r)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/bqueue.py?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/gpg.py?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/notify.py?r1=1.6&r2=1.7&f=u