From 59fe0b29a6f15a61276702e1594b9476e1363fd9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 14 Sep 2011 16:01:40 -0400 Subject: [PATCH] simplify --- Command/Drop.hs | 4 +--- Command/Fsck.hs | 4 +--- Command/Optimize.hs | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Command/Drop.hs b/Command/Drop.hs index 8afffd3cb2..a18729940f 100644 --- a/Command/Drop.hs +++ b/Command/Drop.hs @@ -34,10 +34,8 @@ start (file, attr) = isAnnexed file $ \(key, _) -> do if present then do showStart "drop" file - next $ perform key numcopies + next $ perform key $ readMaybe attr else stop - where - numcopies = readMaybe attr :: Maybe Int perform :: Key -> Maybe Int -> CommandPerform perform key numcopies = do diff --git a/Command/Fsck.hs b/Command/Fsck.hs index cdc68581ee..08bf2b97f4 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -39,9 +39,7 @@ seek = [withNumCopies start] start :: CommandStartAttrFile start (file, attr) = notBareRepo $ isAnnexed file $ \(key, backend) -> do showStart "fsck" file - next $ perform key file backend numcopies - where - numcopies = readMaybe attr :: Maybe Int + next $ perform key file backend $ readMaybe attr perform :: Key -> FilePath -> Backend Annex -> Maybe Int -> CommandPerform perform key file backend numcopies = do diff --git a/Command/Optimize.hs b/Command/Optimize.hs index 40625fc2f0..1a2b2237ff 100644 --- a/Command/Optimize.hs +++ b/Command/Optimize.hs @@ -24,7 +24,7 @@ seek = [withNumCopies start] start :: CommandStartAttrFile start p@(file, attr) = notBareRepo $ isAnnexed file $ \(key, _) -> do - needed <- getNumCopies numcopies + needed <- getNumCopies $ readMaybe attr (_, safelocations) <- trustPartition UnTrusted =<< keyLocations key dispatch needed (length safelocations) where @@ -32,4 +32,3 @@ start p@(file, attr) = notBareRepo $ isAnnexed file $ \(key, _) -> do | present < needed = Command.Get.start file | present > needed = Command.Drop.start p | otherwise = stop - numcopies = readMaybe attr :: Maybe Int