pld-ftp-admin: modules/sign.py - avoid displaying password; don't timeout e...

[arekm]

Author: arekm                        Date: Wed Aug  5 07:28:38 2009 GMT
Module: pld-ftp-admin                 Tag: HEAD
---- Log message:
- avoid displaying password; don't timeout easily

---- Files affected:
pld-ftp-admin/modules:
   sign.py (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: pld-ftp-admin/modules/sign.py
diff -u pld-ftp-admin/modules/sign.py:1.2 pld-ftp-admin/modules/sign.py:1.3
--- pld-ftp-admin/modules/sign.py:1.2	Wed Aug  5 09:12:26 2009
+++ pld-ftp-admin/modules/sign.py	Wed Aug  5 09:28:33 2009
@@ -48,10 +48,10 @@
     os.putenv('LC_ALL', 'C')
     args = ['--resign', '--define', '_signature gpg', '--define', '_gpg_name ' + sign_key] + files
     child = pexpect.spawn('/bin/rpm', args)
-    child.logfile = sys.stderr
+    child.logfile_read = sys.stderr
     child.expect('Enter pass phrase:', timeout=30)
     child.sendline(password)
-    child.expect(pexpect.EOF)
+    child.expect(pexpect.EOF, timeout=None)
     child.close()
     rc = child.exitstatus
     #cmd = ['/bin/rpm', '--resign', '--define', '_signature gpg', '--define', '_gpg_name ' + sign_key] + files
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-ftp-admin/modules/sign.py?r1=1.2&r2=1.3&f=u