Merge lp:~cjwatson/launchpad-buildd/recipe-trusted-local-archive into lp:launchpad-buildd

Proposed by Colin Watson
Status: Merged
Merged at revision: 224
Proposed branch: lp:~cjwatson/launchpad-buildd/recipe-trusted-local-archive
Merge into: lp:launchpad-buildd
Diff against target: 27 lines (+8/-1)
2 files modified
buildrecipe (+1/-1)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~cjwatson/launchpad-buildd/recipe-trusted-local-archive
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+326641@code.launchpad.net

Commit message

buildrecipe: Explicitly mark the local apt archive as trusted (LP: #1701826).

Description of the change

[trusted=yes] is supported back as far as precise, so this should be safe to use nowadays.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) wrote :

We may find that some precise ESM users still expect this to work, but I guess we'll find out.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'buildrecipe'
2--- buildrecipe 2016-12-09 18:04:00 +0000
3+++ buildrecipe 2017-07-01 16:24:42 +0000
4@@ -231,7 +231,7 @@
5 tmp_list_path_relative = os.path.join(
6 self.apt_dir_relative, "buildrecipe-archive.list")
7 with open(tmp_list_path, "w") as tmp_list:
8- print("deb-src file://%s ./" % self.apt_dir_relative,
9+ print("deb-src [trusted=yes] file://%s ./" % self.apt_dir_relative,
10 file=tmp_list)
11 ret = self.chroot([
12 'apt-get',
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2017-05-16 18:54:34 +0000
16+++ debian/changelog 2017-07-01 16:24:42 +0000
17@@ -1,3 +1,10 @@
18+launchpad-buildd (145) UNRELEASED; urgency=medium
19+
20+ * buildrecipe: Explicitly mark the local apt archive as trusted
21+ (LP: #1701826).
22+
23+ -- Colin Watson <cjwatson@ubuntu.com> Sat, 01 Jul 2017 17:21:37 +0100
24+
25 launchpad-buildd (144) xenial; urgency=medium
26
27 * buildsnap: Fix revision_id computation to handle the case where

Subscribers

People subscribed via source and target branches

to all changes: