summaryrefslogtreecommitdiff
diff options
authorPMR <pmr@pmr-lander>2020-01-27 15:25:54 +0000
committerPMR <pmr@pmr-lander>2020-01-27 15:25:54 +0000
commit65529902e19c07a5cef650c1f02b38a5f433d6e3 (patch)
tree967a008f584ac59d6193e7e4d20072d8c5987fbe
parent4f62a1dedd67e6d436351350563e7befd7c20a37 (diff)
parentbdfd3ce027e25a925e15a8b2b94e2d2f6ef8990a (diff)
Merge #378038 from ~jocave/plainbox-provider-checkbox:parts-attachment-fix
-rw-r--r--units/info/jobs.pxu6
1 files changed, 5 insertions, 1 deletions
diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu
index e5ebf7dd..a513deb7 100644
--- a/units/info/jobs.pxu
+++ b/units/info/jobs.pxu
@@ -463,7 +463,11 @@ command: network_configs
id: parts_meta_info_attachment
plugin: attachment
category_id: com.canonical.plainbox::info
-command: cat $SNAP/parts_meta_info $SNAP/checkbox-runtime/parts_meta_info || echo "no parts meta info available"
+command:
+ # some top-level snaps don't bother with parts
+ cat $SNAP/parts_meta_info || true
+ # should always have parts info from content snap
+ cat $CHECKBOX_RUNTIME/parts_meta_info
environ: SNAP
estimated_duration: 0.02
_summary: Attaches an information about all parts that constituted this snap