Merge pull request #542 from jkloetzke/fix-path-handling

Fix some path handling

Author: jkloetzke

pym/bob/invoker.py

@@ -364,12 +364,16 @@ async def executeStep(self, mode, clean=False, keepSandbox=False):
 
                 # Command follows. Stop parsing options.
                 cmdArgs.append("--")
+
+                # Hard override of PATH. The sandbox helper is found by an absolute path!
+                env = { "PATH" : ":".join(self.__spec.sandboxPaths) }
             else:
                 cmdArgs = []
+                env = None
             cmdArgs.extend(callArgs)
 
             if mode == InvocationMode.SHELL:
-                ret = await self.callCommand(cmdArgs, specEnv=False)
+                ret = await self.callCommand(cmdArgs, env=env, specEnv=False)
             elif mode in (InvocationMode.CALL, InvocationMode.UPDATE):
                 for scm in self.__spec.preRunCmds:
                     scm = getScm(scm)
@@ -384,7 +388,7 @@ async def executeStep(self, mode, clean=False, keepSandbox=False):
                     except Exception:
                         self.error(scm.getSource(), "failed")
                         raise
-                await self.checkCommand(cmdArgs, specEnv=False)
+                await self.checkCommand(cmdArgs, env=env, specEnv=False)
                 for a in self.__spec.postRunCmds:
                     a = CheckoutAssert(a)
                     try:

pym/bob/languages.py

@@ -258,8 +258,7 @@ def __formatProlog(spec, keepEnv):
         env.update({
             "PATH": ":".join(
                 [quote(BashLanguage.__munge(os.path.abspath(p))) for p in spec.paths] +
-                (["$PATH"] if not spec.hasSandbox else
-                 [quote(p) for p in spec.sandboxPaths])
+                ["$PATH"]
             ),
             "LD_LIBRARY_PATH": ":".join(
                 quote(BashLanguage.__munge(os.path.abspath(p))) for p in spec.libraryPaths
@@ -342,7 +341,7 @@ def __formatScript(spec, script):
                 }
                 declare -A _BOB_SOURCES=( [0]="Bob prolog" )
                 trap 'bob_handle_error $? >&2 ; exit 99' ERR
-                trap 'for i in "${_BOB_TMP_CLEANUP[@]-}" ; do /bin/rm -f "$i" ; done' EXIT
+                trap 'for i in "${_BOB_TMP_CLEANUP[@]-}" ; do command rm -f "$i" ; done' EXIT
                 set -o errtrace -o nounset -o pipefail
                 """),
             BashLanguage.__formatSetup(spec),
@@ -495,8 +494,7 @@ def __formatProlog(spec):
         env.update({
             "PATH": pathSep.join(
                 [escapePwsh(PwshLanguage.__munge(os.path.abspath(p))) for p in spec.paths] +
-                (["$Env:PATH"] if not spec.hasSandbox else
-                 [escapePwsh(p) for p in spec.sandboxPaths])
+                ["$Env:PATH"]
             ),
             "LD_LIBRARY_PATH": pathSep.join(
                 escapePwsh(PwshLanguage.__munge(os.path.abspath(p))) for p in spec.libraryPaths

test/black-box/sandbox/recipes/sandbox.yaml

@@ -1,6 +1,7 @@
 # Empty sandbox that mounts the whole host
 provideSandbox:
-    paths: []
+    paths: ["/usr/local/bin", "/usr/local/sbin", "/usr/bin", "/usr/sbin",
+            "/bin", "/sbin"]
     mount:
         - /bin
         - /etc

test/black-box/sandbox/run.sh

@@ -1,8 +1,7 @@
 #!/bin/bash -e
 . ../../test-lib.sh 2>/dev/null || { echo "Must run in script directory!" ; exit 1 ; }
 
-# Run a simple sandbox that mounts the full host. Just see if exeuction works
-# even if $PATH is empty in the sandbox.
+# Run a simple sandbox that mounts the full host. Just see if exeuction works.
 
 cleanup