apport-hackers team mailing list archive
-
apport-hackers team
-
Mailing list archive
-
Message #00254
[Merge] lp:~xnox/apport/no-to-keybox into lp:apport
Dimitri John Ledkov has proposed merging lp:~xnox/apport/no-to-keybox into lp:apport.
Requested reviews:
Apport upstream developers (apport-hackers)
For more details, see:
https://code.launchpad.net/~xnox/apport/no-to-keybox/+merge/323513
--
Your team Apport upstream developers is requested to review the proposed merge of lp:~xnox/apport/no-to-keybox into lp:apport.
=== modified file 'backends/packaging-apt-dpkg.py'
--- backends/packaging-apt-dpkg.py 2017-01-25 19:34:48 +0000
+++ backends/packaging-apt-dpkg.py 2017-05-02 17:42:21 +0000
@@ -1450,16 +1450,12 @@
apport.warning("Error: can't find signing_key_fingerprint at %s"
% ppa_archive_url)
continue
- argv = ['gpg', '--no-options',
- '--no-default-keyring',
- '--no-auto-check-trustdb',
- '--keyring',
- os.path.join(trusted_d,
- '%s.gpg' % origin),
- ]
- argv += ['--quiet', '--batch',
- '--keyserver', 'hkp://keyserver.ubuntu.com:80/',
- '--recv', signing_key_fingerprint]
+ argv = ['apt-key', '--keyring',
+ os.path.join(trusted_d, '%s.gpg' % origin),
+ 'adv', '--quiet',
+ '--keyserver', 'keyserver.ubuntu.com', '--recv-key',
+ signing_key_fingerprint]
+
if subprocess.call(argv) != 0:
apport.warning('Unable to import key for %s' %
ppa_archive_url)
=== modified file 'test/test_backend_apt_dpkg.py'
--- test/test_backend_apt_dpkg.py 2017-01-26 23:53:27 +0000
+++ test/test_backend_apt_dpkg.py 2017-05-02 17:42:21 +0000
@@ -1112,6 +1112,7 @@
# install GPG key for ddebs
keyring_dir = os.path.join(self.configdir, 'Foonux 1.2', 'trusted.gpg.d')
os.makedirs(keyring_dir, exist_ok=True)
+ shutil.copy('/usr/share/keyrings/ubuntu-archive-keyring.gpg', keyring_dir)
subprocess.check_call(['apt-key', '--keyring', os.path.join(keyring_dir, 'ddebs.ubuntu.com.gpg'),
'adv', '--quiet', '--keyserver', 'keyserver.ubuntu.com', '--recv-key', 'C8CAB6595FDFF622'],
stdout=subprocess.DEVNULL)