diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-18 12:36:29 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-18 12:36:29 -0400 |
| commit | 19e46a374225bc37131454774f20da4c6a7779d9 (patch) | |
| tree | 5c65e850f0ea011c251e934284ba97352b2badf8 /Command | |
| parent | caadeb495bd603a6f2b19064c4aaaec752bc3b6d (diff) | |
| parent | 2dd79ffb3c58ac881e9def90d0125cf5f9ffb958 (diff) | |
Merge branch 'master' into desymlink
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Vicfg.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Vicfg.hs b/Command/Vicfg.hs index cfe051c4e..8aefd86bb 100644 --- a/Command/Vicfg.hs +++ b/Command/Vicfg.hs @@ -44,7 +44,7 @@ vicfg :: Cfg -> FilePath -> Annex () vicfg curcfg f = do vi <- liftIO $ catchDefaultIO "vi" $ getEnv "EDITOR" -- Allow EDITOR to be processed by the shell, so it can contain options. - unlessM (liftIO $ boolSystem "sh" [Param "-c", Param $ unwords [vi, f]]) $ + unlessM (liftIO $ boolSystem "sh" [Param "-c", Param $ unwords [vi, shellEscape f]]) $ error $ vi ++ " exited nonzero; aborting" r <- parseCfg curcfg <$> liftIO (readFileStrict f) liftIO $ nukeFile f |