From a3206d45d6fe161091d008d39ec86a2263d95446 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 4 Apr 2014 02:06:19 -0400 Subject: redo a change I lost somewhere fixes ghc spain in i386 container on amd64 host --- Propellor/Property/Docker/Shim.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Propellor/Property/Docker') diff --git a/Propellor/Property/Docker/Shim.hs b/Propellor/Property/Docker/Shim.hs index 01c2b22f..c2f35d0c 100644 --- a/Propellor/Property/Docker/Shim.hs +++ b/Propellor/Property/Docker/Shim.hs @@ -3,7 +3,7 @@ -- -- Note: This is currently Debian specific, due to glibcLibs. -module Propellor.Property.Docker.Shim (setup, file) where +module Propellor.Property.Docker.Shim (setup, cleanEnv, file) where import Propellor import Utility.LinuxMkLibs @@ -44,6 +44,9 @@ setup propellorbin dest = do modifyFileMode shim (addModes executeModes) return shim +cleanEnv :: IO () +cleanEnv = void $ unsetEnv "GCONV_PATH" + file :: FilePath -> FilePath -> FilePath file propellorbin dest = dest takeFileName propellorbin -- cgit v1.2.3