summaryrefslogtreecommitdiff
path: root/Command/Import.hs
diff options
context:
space:
mode:
authorGravatar Richard Hartmann <richih@debian.org>2014-01-21 00:58:15 +0100
committerGravatar Richard Hartmann <richih@debian.org>2014-01-21 00:58:15 +0100
commit3b5008704fe9f369c40b172aefb69f956e140bec (patch)
tree83c8c8514e9afdba7a06a2306f7c81b2bd932a10 /Command/Import.hs
parent5025588ab071106ce9563f93a9aea3fb2d032d91 (diff)
parent4140cd6b4d6c0adb899262ca7843589a8b1b2433 (diff)
Merge branch 'master' of git://git-annex.branchable.com
Diffstat (limited to 'Command/Import.hs')
-rw-r--r--Command/Import.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/Command/Import.hs b/Command/Import.hs
index dcf2b0fa0..dda2f3bc4 100644
--- a/Command/Import.hs
+++ b/Command/Import.hs
@@ -61,8 +61,10 @@ getDuplicateMode = gen
gen False False False True = SkipDuplicates
gen _ _ _ _ = error "bad combination of --duplicate, --deduplicate, --clean-duplicates, --skip-duplicates"
-seek :: [CommandSeek]
-seek = [withValue getDuplicateMode $ \mode -> withPathContents $ start mode]
+seek :: CommandSeek
+seek ps = do
+ mode <- getDuplicateMode
+ withPathContents (start mode) ps
start :: DuplicateMode -> (FilePath, FilePath) -> CommandStart
start mode (srcfile, destfile) =