fixed logFile
This commit is contained in:
parent
e0bd9d43a2
commit
1870186632
11 changed files with 26 additions and 36 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue