Merge lp:~xnox/apport/sandbox-keys into lp:~apport-hackers/apport/trunk

Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 3140
Proposed branch: lp:~xnox/apport/sandbox-keys
Merge into: lp:~apport-hackers/apport/trunk
Diff against target: 11 lines (+1/-0)
1 file modified
test/test_backend_apt_dpkg.py (+1/-0)
To merge this branch: bzr merge lp:~xnox/apport/sandbox-keys
Reviewer Review Type Date Requested Status
Apport upstream developers Pending
Review via email: mp+323509@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/test_backend_apt_dpkg.py'
2--- test/test_backend_apt_dpkg.py 2017-01-26 23:53:27 +0000
3+++ test/test_backend_apt_dpkg.py 2017-05-02 16:25:04 +0000
4@@ -1112,6 +1112,7 @@
5 # install GPG key for ddebs
6 keyring_dir = os.path.join(self.configdir, 'Foonux 1.2', 'trusted.gpg.d')
7 os.makedirs(keyring_dir, exist_ok=True)
8+ shutil.copy('/usr/share/keyrings/ubuntu-archive-keyring.gpg', keyring_dir)
9 subprocess.check_call(['apt-key', '--keyring', os.path.join(keyring_dir, 'ddebs.ubuntu.com.gpg'),
10 'adv', '--quiet', '--keyserver', 'keyserver.ubuntu.com', '--recv-key', 'C8CAB6595FDFF622'],
11 stdout=subprocess.DEVNULL)

Subscribers

People subscribed via source and target branches