Checkbox Core

Merge ~jocave/checkbox-core-snap:checkbox-runtime-var into checkbox-core-snap:master

  1. Git
  2. lp:~jocave/checkbox-core-snap
  3. checkbox-runtime-var
  4. Merge into master
Proposed by Jonathan Cave
Status: Merged
Approved by: Jonathan Cave
Approved revision: 1ed1c8172b826ff5714281236ce82a1147b33964
Merged at revision: a95c6b1b380a1ce29b77b442d2281538347a32fd
Proposed branch: ~jocave/checkbox-core-snap:checkbox-runtime-var
Merge into: checkbox-core-snap:master
Diff against target: 27 lines (+8/-0)
2 files modified
config/wrapper_common (+4/-0)
config/wrapper_common_classic (+4/-0)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+378037@code.launchpad.net

Description of the change

Add CHECKBOX_RUNTIME environment variable (see commit for explanation).

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/config/wrapper_common b/config/wrapper_common
2index ac6db9e..e4c7651 100644
3--- a/config/wrapper_common
4+++ b/config/wrapper_common
5@@ -32,3 +32,7 @@ else
6 append_path PYTHONPATH $RUNTIME/usr/lib/python3/dist-packages
7 append_path PYTHONPATH $RUNTIME/lib/python3*/site-packages
8 fi
9+
10+# make sure we always know where the content snap is especially for classic
11+# checkbox snaps where the checkbox-runtime bind mount does not exist
12+export CHECKBOX_RUNTIME=$RUNTIME
13diff --git a/config/wrapper_common_classic b/config/wrapper_common_classic
14index 167af46..a2f88bc 100644
15--- a/config/wrapper_common_classic
16+++ b/config/wrapper_common_classic
17@@ -42,6 +42,10 @@ else
18 append_path PYTHONPATH $RUNTIME/lib/python3*/site-packages
19 fi
20
21+# make sure we always know where the content snap is especially for classic
22+# checkbox snaps where the checkbox-runtime bind mount does not exist
23+export CHECKBOX_RUNTIME=$RUNTIME
24+
25 # Use a modules directory which doesn't exist so we don't load random things
26 # which may then get deleted (or their dependencies) and potentially segfault
27 export GIO_MODULE_DIR=$SNAP/gio/modules-dummy

Subscribers

People subscribed via source and target branches