summaryrefslogtreecommitdiff
diff options
authorJonathan Cave <jonathan.cave@canonical.com>2020-01-24 11:13:22 +0000
committerJonathan Cave <jonathan.cave@canonical.com>2020-01-24 11:13:22 +0000
commitbdfd3ce027e25a925e15a8b2b94e2d2f6ef8990a (patch)
tree31875139d3037dba582437027d6e7f1570d2a49f
parent640082f53fed5a239157069e6560bee188f6c171 (diff)
info: fix parts_meta_info_attach for classic snaps
Use new CHECKBOX_RUNTIME variable to make sure parts_meta_info is collected even in classic snaps
-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 e7ac3ea5..717e1409 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