]> git.donarmstrong.com Git - dak.git/commitdiff
Merge remote branch 'tolimar2/lintian-2.5.0' into merge
authorJoerg Jaspert <joerg@debian.org>
Sun, 5 Jun 2011 10:04:37 +0000 (12:04 +0200)
committerJoerg Jaspert <joerg@debian.org>
Sun, 5 Jun 2011 10:04:37 +0000 (12:04 +0200)
* tolimar2/lintian-2.5.0:
  Add missing-pre-dependency-on-multiarch-support to the lintian autorjects as requested by Steve Langasek
  Adding install-info-used-in-maintainer-script to the non-fatal lintian-reject-tags; closes #607293
  Some lintian tags got renamed with 2.5.0
  Fix typo in templated reported by Mohammed Adnène Trojette

Signed-off-by: Joerg Jaspert <joerg@debian.org>
daklib/gpg.py

index 0e080df5a6558164bb259a9b529cc2087dcfa611..62bfe096510453c180acb4fda1f5b80af6581ffa 100644 (file)
@@ -114,6 +114,10 @@ class SignedFile(object):
                     raise GpgException("No valid signature found. (GPG exited with status code %s)\n%s" % (exit_code, self.stderr))
 
     def _do_io(self, read, write):
+        for fd in write.keys():
+            old = fcntl.fcntl(fd, fcntl.F_GETFL)
+            fcntl.fcntl(fd, fcntl.F_SETFL, old | os.O_NONBLOCK)
+
         read_lines = dict( (fd, []) for fd in read )
         write_pos = dict( (fd, 0) for fd in write )