diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2017-01-27 15:35:52 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2017-01-27 15:35:52 +0100 |
| commit | 9c8ac46a5845b704e64cbb3166e2c2367cf8a4a7 (patch) | |
| tree | 0b33114ec5c5ce9cea605ff1ac2e83aedbf87268 | |
| parent | 6fdc9e6d0252d389c05f74a3c3ff2b4fc4f0917e (diff) | |
address review feedbackbugfix/snap-library-path
| -rw-r--r-- | snap/snapenv/snapenv.go | 17 | ||||
| -rw-r--r-- | snap/snapenv/snapenv_test.go | 4 | ||||
| -rw-r--r-- | tests/main/snap-env/task.yaml | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/snap/snapenv/snapenv.go b/snap/snapenv/snapenv.go index 8d3817dacb..431cb8ecb4 100644 --- a/snap/snapenv/snapenv.go +++ b/snap/snapenv/snapenv.go @@ -70,14 +70,15 @@ func snapEnv(info *snap.Info) map[string]string { // somewhere more reasonable like the snappy module. func basicEnv(info *snap.Info) map[string]string { return map[string]string{ - "SNAP": info.MountDir(), - "SNAP_COMMON": info.CommonDataDir(), - "SNAP_DATA": info.DataDir(), - "SNAP_NAME": info.Name(), - "SNAP_VERSION": info.Version, - "SNAP_REVISION": info.Revision.String(), - "SNAP_ARCH": arch.UbuntuArchitecture(), - "SNAP_LIBRARY_PATH": "/var/lib/snapd/lib/gl", + "SNAP": info.MountDir(), + "SNAP_COMMON": info.CommonDataDir(), + "SNAP_DATA": info.DataDir(), + "SNAP_NAME": info.Name(), + "SNAP_VERSION": info.Version, + "SNAP_REVISION": info.Revision.String(), + "SNAP_ARCH": arch.UbuntuArchitecture(), + // see https://github.com/snapcore/snapd/pull/2732#pullrequestreview-18827193 + "SNAP_LIBRARY_PATH": "/var/lib/snapd/lib/gl:/var/lib/snapd/void", "SNAP_REEXEC": os.Getenv("SNAP_REEXEC"), } } diff --git a/snap/snapenv/snapenv_test.go b/snap/snapenv/snapenv_test.go index 4132f39e93..a38eaf8650 100644 --- a/snap/snapenv/snapenv_test.go +++ b/snap/snapenv/snapenv_test.go @@ -71,7 +71,7 @@ func (ts *HTestSuite) TestBasic(c *C) { "SNAP_ARCH": arch.UbuntuArchitecture(), "SNAP_COMMON": "/var/snap/foo/common", "SNAP_DATA": "/var/snap/foo/17", - "SNAP_LIBRARY_PATH": "/var/lib/snapd/lib/gl", + "SNAP_LIBRARY_PATH": "/var/lib/snapd/lib/gl:/var/lib/snapd/void", "SNAP_NAME": "foo", "SNAP_REEXEC": "", "SNAP_REVISION": "17", @@ -125,7 +125,7 @@ func (s *HTestSuite) TestSnapRunSnapExecEnv(c *C) { "SNAP_ARCH": arch.UbuntuArchitecture(), "SNAP_COMMON": "/var/snap/snapname/common", "SNAP_DATA": "/var/snap/snapname/42", - "SNAP_LIBRARY_PATH": "/var/lib/snapd/lib/gl", + "SNAP_LIBRARY_PATH": "/var/lib/snapd/lib/gl:/var/lib/snapd/void", "SNAP_NAME": "snapname", "SNAP_REEXEC": "", "SNAP_REVISION": "42", diff --git a/tests/main/snap-env/task.yaml b/tests/main/snap-env/task.yaml index b722996c7c..1e68c2fd9b 100644 --- a/tests/main/snap-env/task.yaml +++ b/tests/main/snap-env/task.yaml @@ -15,7 +15,7 @@ execute: | egrep -q '^SNAP_ARCH=(amd64|i386|arm64|armhf|ppc64el)$' snap-vars.txt egrep -q '^SNAP_COMMON=/var/snap/test-snapd-tools/common$' snap-vars.txt egrep -q '^SNAP_DATA=/var/snap/test-snapd-tools/x1$' snap-vars.txt - egrep -q '^SNAP_LIBRARY_PATH=/var/lib/snapd/lib/gl$' snap-vars.txt + egrep -q '^SNAP_LIBRARY_PATH=/var/lib/snapd/lib/gl:/var/lib/snapd/void$' snap-vars.txt egrep -q '^SNAP_NAME=test-snapd-tools$' snap-vars.txt # XXX: probably not something we ought to test # egrep -q '^SNAP_REEXEC=0$' snap-vars.txt |