diff options
| -rw-r--r-- | Utility/Process.hs | 4 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Utility/Process.hs b/Utility/Process.hs index 1e93569be..839cc4078 100644 --- a/Utility/Process.hs +++ b/Utility/Process.hs @@ -101,14 +101,14 @@ writeReadProcessEnv cmd args environ input = do , 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. -} forceSuccessProcess :: CreateProcess -> ProcessHandle -> IO () forceSuccessProcess p pid = do code <- waitForProcess pid case code of 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. -} checkSuccessProcess :: ProcessHandle -> IO Bool diff --git a/debian/changelog b/debian/changelog index 6ee322e1f..75cb3bf8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ git-annex (3.20120925) UNRELEASED; urgency=low a specified amount of time. * fsck: New --incremental-schedule option which is nice for scheduling 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 |