aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArif Ali <arif.ali@canonical.com>2022-08-09 10:52:56 +0100
committerJake Hunsaker <jhunsake@redhat.com>2022-08-15 14:35:26 -0400
commitd1d0812f5318ab2190b32ff83312ef875ddad225 (patch)
tree9e85d6fd3a44d810a1e7d5e309091f40f394e0b1
parent313ed0926ea0a73af920a332b99ffcc8570d24f9 (diff)
downloadsos-d1d0812f5318ab2190b32ff83312ef875ddad225.tar.gz
[snap] Further fixes in snapcraft.yaml for build and run
* Previous commit for dist was wrong, and required site-packages instead * sos report was unablt to run in bionic, and required python3-magic as dependancy Signed-off-by: Arif Ali <arif.ali@canonical.com>
-rw-r--r--snap/snapcraft.yaml8
1 files changed, 5 insertions, 3 deletions
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 6d2d27f5..92b7949e 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -21,17 +21,19 @@ parts:
- python3
- snapcraft
- gettext
+ stage-packages:
+ - python3-magic
apps:
sos:
environment:
- PYTHONPATH: ${PYTHONPATH}:${SNAP}/lib/python3.8/dist-packages
+ PYTHONPATH: ${PYTHONPATH}:${SNAP}/lib/python3.8/site-packages:${SNAP}/usr/lib/python3/dist-packages
command: bin/sos
sosreport:
environment:
- PYTHONPATH: ${PYTHONPATH}:${SNAP}/lib/python3.8/dist-packages
+ PYTHONPATH: ${PYTHONPATH}:${SNAP}/lib/python3.8/site-packages:${SNAP}/usr/lib/python3/dist-packages
command: bin/sos report
sos-collector:
environment:
- PYTHONPATH: ${PYTHONPATH}:${SNAP}/lib/python3.8/dist-packages
+ PYTHONPATH: ${PYTHONPATH}:${SNAP}/lib/python3.8/site-packages:${SNAP}/usr/lib/python3/dist-packages
command: bin/sos collector