diff options
| -rw-r--r-- | Command/Vicfg.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 2 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 diff --git a/debian/changelog b/debian/changelog index a0dd005d1..d83bd7b8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ git-annex (3.20121212) UNRELEASED; urgency=low * kqueue: Fix bug that made broken symlinks not be noticed. + * vicfg: Quote filename. Closes: #696193 -- Joey Hess <joeyh@debian.org> Fri, 14 Dec 2012 16:25:14 -0400 |