Skip to content

Commit 48d2dbc

Browse files
authored
Fix setting of use_squashfs with privileged runner (#208)
We weren't accessing `runner_override[]` correctly, so ```julia runner_override == "privileged" ``` always evaluated to `false`.
1 parent 74fd093 commit 48d2dbc

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

src/BinaryBuilderBase.jl

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,8 @@ function __init__()
191191
end
192192

193193
# If the user has asked for squashfs mounting instead of tarball mounting,
194-
# use that here. Note that on Travis, we default to using squashfs, unless
195-
# BINARYBUILDER_USE_SQUASHFS is set to "false", which overrides this
196-
# default. If we are not on Travis, we default to using tarballs and not
197-
# squashfs images as using them requires `sudo` access.
194+
# use that here. We default to using tarballs and not squashfs images as
195+
# using them requires `sudo` access.
198196
if get(ENV, "BINARYBUILDER_USE_SQUASHFS", "") == "false"
199197
use_squashfs[] = false
200198
elseif get(ENV, "BINARYBUILDER_USE_SQUASHFS", "") == "true"
@@ -205,7 +203,7 @@ function __init__()
205203
if preferred_runner() == DockerRunner
206204
# Conversely, if we're dock'ing it up, don't use it.
207205
use_squashfs[] = false
208-
elseif runner_override == "privileged"
206+
elseif runner_override[] == "privileged"
209207
# If we're forcing a privileged runner, go ahead and default to squashfs
210208
use_squashfs[] = true
211209
end

0 commit comments

Comments
 (0)