summaryrefslogtreecommitdiff
path: root/src/Propellor/Shim.hs
diff options
context:
space:
mode:
authorJoey Hess2014-11-22 12:13:41 -0400
committerJoey Hess2014-11-22 12:13:41 -0400
commit7cbf4841de39761953cf31d32ed86bb4bd949672 (patch)
tree3d8bb9ecd83a24494a40de5211a10f19036a2949 /src/Propellor/Shim.hs
parent557fab609175d7d0a59ffe1269fed02f49f8004e (diff)
parent57ec60d6f307dbf3e237b924e635b90ba889af18 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Shim.hs')
-rw-r--r--src/Propellor/Shim.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Propellor/Shim.hs b/src/Propellor/Shim.hs
index 5b5aa68e..1bfbb0ca 100644
--- a/src/Propellor/Shim.hs
+++ b/src/Propellor/Shim.hs
@@ -45,6 +45,8 @@ setup propellorbin dest = do
modifyFileMode shim (addModes executeModes)
return shim
+-- Called when the shimmed propellor is running, so that commands it runs
+-- don't see it.
cleanEnv :: IO ()
cleanEnv = void $ unsetEnv "GCONV_PATH"