mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into watch

Browse source
This commit is contained in:
Joey Hess 2012-06-07 13:48:55 -04:00
commit 727158ff55
11 changed files with 93 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Command/InitRemote.hs
View file

@ -15,6 +15,7 @@ import qualified Remote
import qualified Logs.Remote
import qualified Types.Remote as R
import Annex.UUID
import Logs.UUID
def :: [Command]
def = [command "initremote"
@ -60,6 +61,7 @@ findByName name = do
where
generate = do
uuid <- liftIO genUUID
describeUUID uuid name
return (uuid, M.insert nameKey name M.empty)
findByName' :: String -> M.Map UUID R.RemoteConfig -> Maybe (UUID, R.RemoteConfig)