pexpect needs explicit encoding when run under python3

[projects/pld-ftp-admin.git] / modules / sign.py

diff --git a/modules/sign.py b/modules/sign.py
index 153ec67ea32a996d04f53edbdbbb6417524efa42..ef9e814b5d8c01b5353984585539796964f9a44d 100644 (file)
--- a/modules/sign.py
+++ b/modules/sign.py
@@ -4,7 +4,6 @@
 import os
 import sys
 import rpm
-import subprocess
 import pexpect
 from config import sign_key
 
@@ -17,7 +16,7 @@ def getSigInfo(hdr):
     siginfo = hdr.sprintf(string)
     if siginfo == '(none)':
         return None
-   
+
     return siginfo.split(',')[2].lstrip()
 
 def is_signed(rpm_file):
@@ -28,7 +27,7 @@ def is_signed(rpm_file):
         return None
 
     ts = rpm.ts()
-    ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
+    ts.setVSFlags(rpm.RPMVSF_NODSAHEADER)
     fdno = os.open(rpm_file, os.O_RDONLY)
     hdr = ts.hdrFromFdno(fdno)
     os.close(fdno)
@@ -41,20 +40,20 @@ def is_signed(rpm_file):
 
 def signpkgs(files, password):
     if not os.path.isfile('/usr/bin/gpg'):
-        raise OSError, 'Missing gnupg binary'
+        raise OSError('Missing gnupg binary')
     if not os.path.isfile('/bin/rpm'):
-        raise OSError, 'Missing rpm binary'
+        raise OSError('Missing rpm binary')
 
     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 = pexpect.spawn('/bin/rpm', args, encoding='utf-8')
+    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
-    #rc = subprocess.call(cmd, stdin = subprocess.PIPE, stdout = subprocess.PIPE, stderr = subprocess.PIPE, close_fds = True)
     if rc != 0:
-        raise OSError, 'package signing failed'
+        raise OSError('package signing failed')
+    for rpm in files:
+        os.chmod(rpm, 0o644)