summaryrefslogtreecommitdiff
path: root/units/info
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
commita98f6995b799ab1b9b48ea8f1cc35985bf00438f (patch)
treee5e25845837ab4986100746c48354999ce137c9d /units/info
parentcdf88690fe4998d3e6e771d609b4d32f73da2667 (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
Diffstat (limited to 'units/info')
-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 e7ac3ea..717e140 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