diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-08 02:06:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-08 02:07:11 -0400 |
| commit | 634cf61c7989f5d20bccd822e2fd568ccbdef947 (patch) | |
| tree | 29ff196aea04f736dcc4f3b4e3929bdefe754c71 /Propellor/Property/Docker | |
| parent | 3068fdbe78cb86a9272b1ce5200653f5331fb173 (diff) | |
| parent | 7ba62a28b51dc5826c70d3be0ab41825e31d28ac (diff) | |
Merge branch 'joeyconfig'
Conflicts:
Propellor/Property/Docker.hs
Diffstat (limited to 'Propellor/Property/Docker')
| -rw-r--r-- | Propellor/Property/Docker/Shim.hs | 5 |
1 files changed, 4 insertions, 1 deletions
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 |