diff -Nru launchpad-buildd-142~213~ubuntu14.04.1/buildsnap launchpad-buildd-142/buildsnap --- launchpad-buildd-142~213~ubuntu14.04.1/buildsnap 2016-12-10 16:32:01.000000000 +0000 +++ launchpad-buildd-142/buildsnap 2017-02-10 11:39:04.000000000 +0000 @@ -126,7 +126,10 @@ def pull(self): """Run pull phase.""" print("Running pull phase...") - env = {"SNAPCRAFT_LOCAL_SOURCES": "1"} + env = { + "SNAPCRAFT_LOCAL_SOURCES": "1", + "SNAPCRAFT_SETUP_CORE": "1", + } if self.options.proxy_url: env["http_proxy"] = self.options.proxy_url env["https_proxy"] = self.options.proxy_url diff -Nru launchpad-buildd-142~213~ubuntu14.04.1/debian/bzr-builder.manifest launchpad-buildd-142/debian/bzr-builder.manifest --- launchpad-buildd-142~213~ubuntu14.04.1/debian/bzr-builder.manifest 2016-12-10 16:32:01.000000000 +0000 +++ launchpad-buildd-142/debian/bzr-builder.manifest 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# bzr-builder format 0.3 deb-version {debupstream}~213 -lp:launchpad-buildd revid:cjwatson@canonical.com-20161209180521-5okp7u3tlkdniral diff -Nru launchpad-buildd-142~213~ubuntu14.04.1/debian/changelog launchpad-buildd-142/debian/changelog --- launchpad-buildd-142~213~ubuntu14.04.1/debian/changelog 2016-12-10 16:32:01.000000000 +0000 +++ launchpad-buildd-142/debian/changelog 2017-02-10 14:53:44.000000000 +0000 @@ -1,10 +1,4 @@ -launchpad-buildd (142~213~ubuntu14.04.1) trusty; urgency=low - - * Auto build. - - -- Launchpad Package Builder Sat, 10 Dec 2016 16:32:01 +0000 - -launchpad-buildd (142) UNRELEASED; urgency=medium +launchpad-buildd (142) trusty; urgency=medium * lpbuildd.binarypackage: Pass DEB_BUILD_OPTIONS=noautodbgsym if we have not been told to build debug symbols (LP: #1623256). @@ -13,8 +7,11 @@ * lpbuildd.pottery.intltool: Remove unused and Python-3-unfriendly string/file conditional from ConfigFile.__init__. * Use Python-3-compatible forms of "print" and "except". + * buildsnap: Set SNAPCRAFT_SETUP_CORE=1 during pull phase so that + snapcraft will fetch and unpack the core snap for classic confinement + when necessary (LP: #1650946). - -- Colin Watson Fri, 09 Dec 2016 16:15:49 +0000 + -- Colin Watson Fri, 10 Feb 2017 14:53:43 +0000 launchpad-buildd (141) trusty; urgency=medium