diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-22 16:13:43 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-22 16:17:16 -0400 |
| commit | 1870186632e3d4f99e9b87f71f0ddea83ad04568 (patch) | |
| tree | 2abd0484a9a729c8ec79997e25d5d5d92e0bdf3b /Command | |
| parent | e0bd9d43a21bae8193cb0a56be2246ee8cdafdaa (diff) | |
fixed logFile
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Fsck.hs | 2 | ||||
| -rw-r--r-- | Command/Init.hs | 4 | ||||
| -rw-r--r-- | Command/Unused.hs | 3 | ||||
| -rw-r--r-- | Command/Whereis.hs | 4 |
4 files changed, 4 insertions, 9 deletions
diff --git a/Command/Fsck.hs b/Command/Fsck.hs index 7c840d528..0e3df03dd 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -60,7 +60,7 @@ verifyLocationLog key file = do preventWrite (parentDir f) u <- getUUID g - uuids <- keyLocations g key + uuids <- keyLocations key case (present, u `elem` uuids) of (True, False) -> do diff --git a/Command/Init.hs b/Command/Init.hs index 1e1eb527a..dbf5666cd 100644 --- a/Command/Init.hs +++ b/Command/Init.hs @@ -8,9 +8,8 @@ module Command.Init where import Control.Monad.State (liftIO) -import Control.Monad (when, unless) +import Control.Monad (when) import System.Directory -import System.FilePath import Command import qualified Annex @@ -19,7 +18,6 @@ import qualified Branch import UUID import Version import Messages -import Locations import Types import Utility diff --git a/Command/Unused.hs b/Command/Unused.hs index 4389b2209..5d4e433ad 100644 --- a/Command/Unused.hs +++ b/Command/Unused.hs @@ -78,8 +78,7 @@ checkRemoteUnused' r = do showLongNote $ "\n" where isthere k = do - g <- Annex.gitRepo - us <- keyLocations g k + us <- keyLocations k return $ uuid `elem` us uuid = Remote.uuid r diff --git a/Command/Whereis.hs b/Command/Whereis.hs index bcd4a2e22..3a7213217 100644 --- a/Command/Whereis.hs +++ b/Command/Whereis.hs @@ -7,7 +7,6 @@ module Command.Whereis where -import qualified Annex import LocationLog import Command import Messages @@ -28,8 +27,7 @@ start file = isAnnexed file $ \(key, _) -> do perform :: Key -> CommandPerform perform key = do - g <- Annex.gitRepo - uuids <- keyLocations g key + uuids <- keyLocations key let num = length uuids showNote $ show num ++ " " ++ copiesplural num if null $ uuids |