diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-06 19:00:01 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-06 19:00:01 -0400 |
| commit | 6be8289158fd30d972ac22766452e7c9dc809e6f (patch) | |
| tree | ba4929c7c8f27d2b43051f637394115cda39258b /Config | |
| parent | 6ea1214fa5d19241851a977ab82437563e2afc81 (diff) | |
| parent | 971ed2a464a1a1e4d5e650e32390d232cd354d9d (diff) | |
Merge branch 'master' into relativepaths
Conflicts:
Locations.hs
debian/changelog
Diffstat (limited to 'Config')
| -rw-r--r-- | Config/Files.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Config/Files.hs b/Config/Files.hs index 8d5c1fd12..edea83eeb 100644 --- a/Config/Files.hs +++ b/Config/Files.hs @@ -33,7 +33,7 @@ modifyAutoStartFile func = do let dirs' = nubBy equalFilePath $ func dirs when (dirs' /= dirs) $ do f <- autoStartFile - createDirectoryIfMissing True (parentDir f) + createDirectoryIfMissing True (takeDirectory f) viaTmp writeFile f $ unlines dirs' {- Adds a directory to the autostart file. If the directory is already |