diff options
| author | Nicolas Martinelli <nim@odoo.com> | 2015-02-20 12:53:33 +0100 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-02-20 16:56:14 +0100 |
| commit | d5c4a1c3e13ba90d0ef51e3d7e93094e573c32f2 (patch) | |
| tree | b9cbbd7f0aafca5547dfc167bbbea06b48d16b1c /setup | |
| parent | 520360d80b0af02f9afc806e3bb5c1400b641cba (diff) | |
[FIX] Packaging: possibility to have a PGP key without passphrase
Diffstat (limited to 'setup')
| -rwxr-xr-x | setup/package.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/setup/package.py b/setup/package.py index 24f7afa1e65..17668545847 100755 --- a/setup/package.py +++ b/setup/package.py @@ -266,11 +266,12 @@ def build_deb(o): subprocess.call(cmd, cwd=o.build_dir) deb = pexpect.spawn('dpkg-buildpackage -rfakeroot -k%s' % GPGID, cwd=o.build_dir) deb.logfile = stdout - deb.expect_exact('Enter passphrase: ', timeout=1200) - deb.send(GPGPASSPHRASE + '\r\n') - deb.expect_exact('Enter passphrase: ') - deb.send(GPGPASSPHRASE + '\r\n') - deb.expect(pexpect.EOF) + if GPGPASSPHRASE: + deb.expect_exact('Enter passphrase: ', timeout=1200) + deb.send(GPGPASSPHRASE + '\r\n') + deb.expect_exact('Enter passphrase: ') + deb.send(GPGPASSPHRASE + '\r\n') + deb.expect(pexpect.EOF, timeout=1200) system(['mv', glob('%s/../odoo_*.deb' % o.build_dir)[0], '%s' % o.build_dir]) system(['mv', glob('%s/../odoo_*.dsc' % o.build_dir)[0], '%s' % o.build_dir]) system(['mv', glob('%s/../odoo_*_amd64.changes' % o.build_dir)[0], '%s' % o.build_dir]) |