mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

vicfg: Quote filename. Closes: #696193

Browse source
This commit is contained in:
Joey Hess 2012-12-18 12:19:24 -04:00
parent 0846d60c3c
commit 77931c1e92
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Command/Vicfg.hs
View file

@ -44,7 +44,7 @@ vicfg :: Cfg -> FilePath -> Annex ()
vicfg curcfg f = do vicfg curcfg f = do
vi <- liftIO $ catchDefaultIO "vi" $ getEnv "EDITOR" vi <- liftIO $ catchDefaultIO "vi" $ getEnv "EDITOR"
-- Allow EDITOR to be processed by the shell, so it can contain options. -- 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" error $ vi ++ " exited nonzero; aborting"
r <- parseCfg curcfg <$> liftIO (readFileStrict f) r <- parseCfg curcfg <$> liftIO (readFileStrict f)
liftIO $ nukeFile f liftIO $ nukeFile f

1
debian/changelog vendored
View file

@ -1,6 +1,7 @@
git-annex (3.20121212) UNRELEASED; urgency=low git-annex (3.20121212) UNRELEASED; urgency=low
* kqueue: Fix bug that made broken symlinks not be noticed. * 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 -- Joey Hess <joeyh@debian.org> Fri, 14 Dec 2012 16:25:14 -0400