diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-09 13:11:56 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-09 13:11:56 -0400 |
| commit | 425bc1107aebdb701cdcee44da731dd918cd470d (patch) | |
| tree | 25bcacb37277b70aa7bd0caaf0fe7c3edc665653 /Assistant.hs | |
| parent | 20c7644a4d85434cf49840ea92fca0c723710c72 (diff) | |
revert parentDir change
Reverts 2bba5bc22d049272d3328bfa6c452d3e2e50e86c
Unfortunately, this caused breakage on Windows, and possibly elsewhere,
because parentDir and takeDirectory do not behave the same when there is a
trailing directory separator.
Diffstat (limited to 'Assistant.hs')
| -rw-r--r-- | Assistant.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Assistant.hs b/Assistant.hs index 0c7aa2c56..2ba778d80 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -78,7 +78,7 @@ startDaemon assistant foreground startdelay cannotrun listenhost startbrowser = logfile <- fromRepo gitAnnexLogFile liftIO $ debugM desc $ "logging to " ++ logfile #ifndef mingw32_HOST_OS - createAnnexDirectory (takeDirectory logfile) + createAnnexDirectory (parentDir logfile) logfd <- liftIO $ handleToFd =<< openLog logfile if foreground then do @@ -98,7 +98,7 @@ startDaemon assistant foreground startdelay cannotrun listenhost startbrowser = -- log file. The only way to do so is to restart the program. when (foreground || not foreground) $ do let flag = "GIT_ANNEX_OUTPUT_REDIR" - createAnnexDirectory (takeDirectory logfile) + createAnnexDirectory (parentDir logfile) ifM (liftIO $ isNothing <$> getEnv flag) ( liftIO $ withFile devNull WriteMode $ \nullh -> do loghandle <- openLog logfile |