diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-28 16:11:28 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-28 16:11:28 -0400 |
| commit | 82161654830b0dc4187e9928555c9321ef61bb89 (patch) | |
| tree | fef3edba1366663956ed484a9c9951616765d505 /Logs | |
| parent | 7ca8ec00a7fcda71a08d22f06838424765a1b215 (diff) | |
import Data.Default in Common
Diffstat (limited to 'Logs')
| -rw-r--r-- | Logs/PreferredContent.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Logs/PreferredContent.hs b/Logs/PreferredContent.hs index 83269e6d7..6c885041a 100644 --- a/Logs/PreferredContent.hs +++ b/Logs/PreferredContent.hs @@ -52,12 +52,12 @@ isRequiredContent :: Maybe UUID -> AssumeNotPresent -> Maybe Key -> AssociatedFi isRequiredContent = checkMap requiredContentMap checkMap :: Annex (FileMatcherMap Annex) -> Maybe UUID -> AssumeNotPresent -> Maybe Key -> AssociatedFile -> Bool -> Annex Bool -checkMap getmap mu notpresent mkey afile def = do +checkMap getmap mu notpresent mkey afile d = do u <- maybe getUUID return mu m <- getmap case M.lookup u m of - Nothing -> return def - Just matcher -> checkMatcher matcher mkey afile notpresent def + Nothing -> return d + Just matcher -> checkMatcher matcher mkey afile notpresent d preferredContentMap :: Annex (FileMatcherMap Annex) preferredContentMap = maybe (fst <$> preferredRequiredMapsLoad) return |