diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-10-11 14:43:45 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-10-11 14:43:45 -0400 |
| commit | b505ba83e8b62a9ed0ec2fb96448c5fc801184d9 (patch) | |
| tree | 664eb4af9f274dfc13eb9abfab86421ebe38e881 /Command | |
| parent | 025ded4a2dfb58a6ec0cb47b9d625d593a4e1977 (diff) | |
minor syntax changes
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/ConfigList.hs | 3 | ||||
| -rw-r--r-- | Command/Fsck.hs | 2 | ||||
| -rw-r--r-- | Command/Init.hs | 3 | ||||
| -rw-r--r-- | Command/Move.hs | 6 |
4 files changed, 5 insertions, 9 deletions
diff --git a/Command/ConfigList.hs b/Command/ConfigList.hs index d52c33f3b..60f71eee6 100644 --- a/Command/ConfigList.hs +++ b/Command/ConfigList.hs @@ -20,7 +20,6 @@ seek = [withNothing start] start :: CommandStart start = do - g <- gitRepo - u <- getUUID g + u <- getUUID liftIO $ putStrLn $ "annex.uuid=" ++ u stop diff --git a/Command/Fsck.hs b/Command/Fsck.hs index 689271dd7..16e834fbf 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -55,7 +55,7 @@ verifyLocationLog key file = do preventWrite f preventWrite (parentDir f) - u <- getUUID g + u <- getUUID uuids <- keyLocations key case (present, u `elem` uuids) of diff --git a/Command/Init.hs b/Command/Init.hs index ace06c2c3..b9dffb5cd 100644 --- a/Command/Init.hs +++ b/Command/Init.hs @@ -29,7 +29,6 @@ start ws = do perform :: String -> CommandPerform perform description = do initialize - g <- gitRepo - u <- getUUID g + u <- getUUID describeUUID u description next $ return True diff --git a/Command/Move.hs b/Command/Move.hs index d650c5251..52eb49da1 100644 --- a/Command/Move.hs +++ b/Command/Move.hs @@ -72,8 +72,7 @@ remoteHasKey remote key present = do -} toStart :: Remote.Remote Annex -> Bool -> FilePath -> CommandStart toStart dest move file = isAnnexed file $ \(key, _) -> do - g <- gitRepo - u <- getUUID g + u <- getUUID ishere <- inAnnex key if not ishere || u == Remote.uuid dest then stop -- not here, so nothing to do @@ -122,8 +121,7 @@ toCleanup dest move key = do -} fromStart :: Remote.Remote Annex -> Bool -> FilePath -> CommandStart fromStart src move file = isAnnexed file $ \(key, _) -> do - g <- gitRepo - u <- getUUID g + u <- getUUID remotes <- Remote.keyPossibilities key if u == Remote.uuid src || not (any (== src) remotes) then stop |