diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-06 18:29:07 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-06 18:55:56 -0400 |
| commit | 2bba5bc22d049272d3328bfa6c452d3e2e50e86c (patch) | |
| tree | 19feab50e43dc330038224ea98b371916ca02133 /Assistant.hs | |
| parent | 014e909a449d0822eff4962a504d6a524abe8fc7 (diff) | |
made parentDir return a Maybe FilePath; removed most uses of it
parentDir is less safe than takeDirectory, especially when working
with relative FilePaths. It's really only useful in loops that
want to terminate at /
This commit was sponsored by Audric SCHILTKNECHT.
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 2ba778d80..0c7aa2c56 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 (parentDir logfile) + createAnnexDirectory (takeDirectory 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 (parentDir logfile) + createAnnexDirectory (takeDirectory logfile) ifM (liftIO $ isNothing <$> getEnv flag) ( liftIO $ withFile devNull WriteMode $ \nullh -> do loghandle <- openLog logfile |