diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-12-20 15:23:59 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-12-20 15:23:59 -0400 |
| commit | d881870819b0eb5b1bd8e57c97c43c36bd59354b (patch) | |
| tree | 8576b871ce6658b58e2245943009ef83e716772c | |
| parent | 15fe627d3da6bd54e5a288626c7e1b3676a9a092 (diff) | |
Fix build with directory-1.3.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Utility/SystemDirectory.hs | 2 | ||||
| -rw-r--r-- | doc/bugs/getFileSize_conflict_between_Utility.Directory_and_Utility.FileSize.mdwn | 1 |
3 files changed, 3 insertions, 1 deletions
@@ -21,6 +21,7 @@ git-annex (6.20161211) UNRELEASED; urgency=medium supporting locales such as, en_GB.UTF-8. * rekey --force: Incorrectly marked the new key's content as being present in the local repo even when it was not. + * Fix build with directory-1.3. -- Joey Hess <id@joeyh.name> Sun, 11 Dec 2016 21:29:51 -0400 diff --git a/Utility/SystemDirectory.hs b/Utility/SystemDirectory.hs index 3dd44d199..b9040fe13 100644 --- a/Utility/SystemDirectory.hs +++ b/Utility/SystemDirectory.hs @@ -13,4 +13,4 @@ module Utility.SystemDirectory ( module System.Directory ) where -import System.Directory hiding (isSymbolicLink) +import System.Directory hiding (isSymbolicLink, getFileSize) diff --git a/doc/bugs/getFileSize_conflict_between_Utility.Directory_and_Utility.FileSize.mdwn b/doc/bugs/getFileSize_conflict_between_Utility.Directory_and_Utility.FileSize.mdwn index b744f0049..75a546159 100644 --- a/doc/bugs/getFileSize_conflict_between_Utility.Directory_and_Utility.FileSize.mdwn +++ b/doc/bugs/getFileSize_conflict_between_Utility.Directory_and_Utility.FileSize.mdwn @@ -31,3 +31,4 @@ import Utility.Directory as X hiding (getFileSize) ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders) Yes :) +> [[fixed|done]]; thanks for reporting! |