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

[Colin Watson]

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

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

[William Grant (wgrant)]

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

review: Approve (code)

=== modified file 'buildrecipe'
--- buildrecipe	2016-12-09 18:04:00 +0000
+++ buildrecipe	2017-07-01 16:24:42 +0000
@@ -231,7 +231,7 @@
         tmp_list_path_relative = os.path.join(
             self.apt_dir_relative, "buildrecipe-archive.list")
         with open(tmp_list_path, "w") as tmp_list:
-            print("deb-src file://%s ./" % self.apt_dir_relative,
+            print("deb-src [trusted=yes] file://%s ./" % self.apt_dir_relative,
                   file=tmp_list)
         ret = self.chroot([
                 'apt-get',
 
=== modified file 'debian/changelog'
--- debian/changelog	2017-05-16 18:54:34 +0000
+++ debian/changelog	2017-07-01 16:24:42 +0000
@@ -1,3 +1,10 @@
+launchpad-buildd (145) UNRELEASED; urgency=medium
+
+  * buildrecipe: Explicitly mark the local apt archive as trusted
+    (LP: #1701826).
+
+ -- Colin Watson <[e-mail]>  Sat, 01 Jul 2017 17:21:37 +0100
+
 launchpad-buildd (144) xenial; urgency=medium
 
   * buildsnap: Fix revision_id computation to handle the case where