Checkbox Provider - Base

Merge ~jocave/plainbox-provider-checkbox:parts-attachment-fix into plainbox-provider-checkbox:master

  1. Git
  2. lp:~jocave/plainbox-provider-checkbox
  3. parts-attachment-fix
  4. Merge into master
Proposed by Jonathan Cave
Status: Merged
Approved by: Jonathan Cave
Approved revision: bdfd3ce027e25a925e15a8b2b94e2d2f6ef8990a
Merged at revision: 65529902e19c07a5cef650c1f02b38a5f433d6e3
Proposed branch: ~jocave/plainbox-provider-checkbox:parts-attachment-fix
Merge into: plainbox-provider-checkbox:master
Diff against target: 17 lines (+5/-1)
1 file modified
units/info/jobs.pxu (+5/-1)
Reviewer Review Type Date Requested Status
Sylvain Pineau Approve
Review via email: mp+378038@code.launchpad.net

Description of the change

The parts_meta_info_attachment was passing when run as part of classic snaps despite failing to get any info. This fixes the job so it works in both classic and core snaps.

Requires:
https://code.launchpad.net/~jocave/checkbox-core-snap/+git/checkbox-core-snap/+merge/378037

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu
2index e7ac3ea..717e140 100644
3--- a/units/info/jobs.pxu
4+++ b/units/info/jobs.pxu
5@@ -463,7 +463,11 @@ command: network_configs
6 id: parts_meta_info_attachment
7 plugin: attachment
8 category_id: com.canonical.plainbox::info
9-command: cat $SNAP/parts_meta_info $SNAP/checkbox-runtime/parts_meta_info || echo "no parts meta info available"
10+command:
11+ # some top-level snaps don't bother with parts
12+ cat $SNAP/parts_meta_info || true
13+ # should always have parts info from content snap
14+ cat $CHECKBOX_RUNTIME/parts_meta_info
15 environ: SNAP
16 estimated_duration: 0.02
17 _summary: Attaches an information about all parts that constituted this snap

Subscribers

People subscribed via source and target branches