Launchpad itself

Merge lp:~cjwatson/launchpad/snap-tools-fingerprint-2 into lp:launchpad

  1. snap-tools-fingerprint-2
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 18413
Proposed branch: lp:~cjwatson/launchpad/snap-tools-fingerprint-2
Merge into: lp:launchpad
Diff against target: 14 lines (+3/-1)
1 file modified
lib/lp/snappy/model/snapbuildbehaviour.py (+3/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad/snap-tools-fingerprint-2
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+325648@code.launchpad.net

Commit message

Actually use config.snappy.tools_fingerprint for snap builds.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/snappy/model/snapbuildbehaviour.py'
--- lib/lp/snappy/model/snapbuildbehaviour.py 2017-06-13 17:08:16 +0000
+++ lib/lp/snappy/model/snapbuildbehaviour.py 2017-06-14 13:34:54 +0000
@@ -102,7 +102,9 @@
102 args["archives"], args["trusted_keys"] = (102 args["archives"], args["trusted_keys"] = (
103 yield get_sources_list_for_building(103 yield get_sources_list_for_building(
104 build, build.distro_arch_series, None,104 build, build.distro_arch_series, None,
105 tools_source=config.snappy.tools_source, logger=logger))105 tools_source=config.snappy.tools_source,
106 tools_fingerprint=config.snappy.tools_fingerprint,
107 logger=logger))
106 args["archive_private"] = build.archive.private108 args["archive_private"] = build.archive.private
107 if build.snap.branch is not None:109 if build.snap.branch is not None:
108 args["branch"] = build.snap.branch.bzr_identity110 args["branch"] = build.snap.branch.bzr_identity