summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorArkadiusz Miśkiewicz2009-08-05 07:28:33 (GMT)
committerArkadiusz Miśkiewicz2009-08-05 07:28:33 (GMT)
commit866a153b48fa81f87579f1796e8357b97653755e (patch)
tree54bd8a702ba8c802fd9f4d6a52f9cdbae7144f8a /modules
parent89b8ea8ddb4c154b34ce9a98c970fc9b19196884 (diff)
downloadpld-ftp-admin-866a153b48fa81f87579f1796e8357b97653755e.zip
pld-ftp-admin-866a153b48fa81f87579f1796e8357b97653755e.tar.gz
- avoid displaying password; don't timeout easily
Changed files: modules/sign.py -> 1.3
Diffstat (limited to 'modules')
-rw-r--r--modules/sign.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/sign.py b/modules/sign.py
index 153ec67..36b3552 100644
--- a/modules/sign.py
+++ b/modules/sign.py
@@ -48,10 +48,10 @@ def signpkgs(files, password):
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