Merge ~cjwatson/snapstore-client:restore-sync-snap-assertions into snapstore-client:master

Proposed by Colin Watson
Status: Merged
Merged at revision: e45be55d1bde89541fc9d0ca68326f207d20a80c
Proposed branch: ~cjwatson/snapstore-client:restore-sync-snap-assertions
Merge into: snapstore-client:master
Diff against target: 17 lines (+6/-0)
1 file modified
siab_client/logic/dump.py (+6/-0)
Reviewer Review Type Date Requested Status
Adam Collard (community) Approve
Review via email: mp+326004@code.launchpad.net

Commit message

Restore _sync_snap_assertions call in _import_snap

William Grant says that he removed this by accident in
6fa0aa1c8bdf3f204aead95c47fe24b41a4fe469.

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

I accidentally started this from the wrong branch point, but have now rebased.

Revision history for this message
Adam Collard (adam-collard) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/siab_client/logic/dump.py b/siab_client/logic/dump.py
2index 559112d..f009cc3 100644
3--- a/siab_client/logic/dump.py
4+++ b/siab_client/logic/dump.py
5@@ -80,6 +80,12 @@ def _import_snap(dir):
6 codecs.decode(rev_meta['binary_sha3_384'], 'hex')).decode('ascii')
7 for rev_meta in rev_metas.values()]
8
9+ # Ensure we have all relevant assertions locally before exposing new
10+ # revisions to clients.
11+ _sync_snap_assertions(
12+ 'https://assertions.ubuntu.com/v1/', snap_meta['snap_id'], '16',
13+ sha3_384s)
14+
15 seen_archs = set()
16 seen_tracks = set()
17 seen_track_risk_archs = set()

Subscribers

People subscribed via source and target branches

to all changes: