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

Fix fallback to ~/Desktop when xdg-user-dir is not available. Closes: #688833

Browse source 
Really the fix here is to make Utility.Process only throw IOErrors,
which is what I naturally assumed it'd throw.
This commit is contained in:
Joey Hess 2012-09-25 22:48:17 -04:00
parent 84d431a679
commit 926ffaf3f3
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Utility/Process.hs
View file

@ -101,14 +101,14 @@ writeReadProcessEnv cmd args environ input = do
, env = environ , env = environ
} }
{- Waits for a ProcessHandle, and throws an exception if the process {- Waits for a ProcessHandle, and throws an IOError if the process
- did not exit successfully. -} - did not exit successfully. -}
forceSuccessProcess :: CreateProcess -> ProcessHandle -> IO () forceSuccessProcess :: CreateProcess -> ProcessHandle -> IO ()
forceSuccessProcess p pid = do forceSuccessProcess p pid = do
code <- waitForProcess pid code <- waitForProcess pid
case code of case code of
ExitSuccess -> return () ExitSuccess -> return ()
ExitFailure n -> error $ showCmd p ++ " exited " ++ show n ExitFailure n -> fail $ showCmd p ++ " exited " ++ show n
{- Waits for a ProcessHandle and returns True if it exited successfully. -} {- Waits for a ProcessHandle and returns True if it exited successfully. -}
checkSuccessProcess :: ProcessHandle -> IO Bool checkSuccessProcess :: ProcessHandle -> IO Bool

2
debian/changelog vendored
View file

@ -10,6 +10,8 @@ git-annex (3.20120925) UNRELEASED; urgency=low
a specified amount of time. a specified amount of time.
* fsck: New --incremental-schedule option which is nice for scheduling * fsck: New --incremental-schedule option which is nice for scheduling
eg, monthly incremental fsck runs in cron jobs. eg, monthly incremental fsck runs in cron jobs.
* Fix fallback to ~/Desktop when xdg-user-dir is not available.
Closes: #688833
-- Joey Hess <joeyh@debian.org> Mon, 24 Sep 2012 19:58:07 -0400 -- Joey Hess <joeyh@debian.org> Mon, 24 Sep 2012 19:58:07 -0400