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

more buprepo fixes

Browse source
This commit is contained in:
Joey Hess 2011-04-09 12:45:30 -04:00
parent c739c7d787
commit f808a83350
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Remote/Bup.hs
View file

@ -42,7 +42,7 @@ gen :: Git.Repo -> UUID -> Maybe (M.Map String String) -> Annex (Remote Annex)
gen r u c = do gen r u c = do
buprepo <- getConfig r "buprepo" (error "missing buprepo") buprepo <- getConfig r "buprepo" (error "missing buprepo")
cst <- remoteCost r (if bupLocal buprepo then semiCheapRemoteCost else expensiveRemoteCost) cst <- remoteCost r (if bupLocal buprepo then semiCheapRemoteCost else expensiveRemoteCost)
-- u' <- getBupUUID r u u' <- getBupUUID buprepo u
return $ this cst buprepo u' return $ this cst buprepo u'
where where
@ -61,8 +61,8 @@ gen r u c = do
bupSetup :: UUID -> M.Map String String -> Annex (M.Map String String) bupSetup :: UUID -> M.Map String String -> Annex (M.Map String String)
bupSetup u c = do bupSetup u c = do
-- verify configuration is sane -- verify configuration is sane
let buprepo = case M.lookup "remote" c of let buprepo = case M.lookup "buprepo" c of
Nothing -> error "Specify remote=" Nothing -> error "Specify buprepo="
Just r -> r Just r -> r
case M.lookup "encryption" c of case M.lookup "encryption" c of
Nothing -> error "Specify encryption=key or encryption=none" Nothing -> error "Specify encryption=key or encryption=none"
@ -160,8 +160,9 @@ storeBupUUID u buprepo = do
{- Allow for bup repositories on removable media by checking {- Allow for bup repositories on removable media by checking
- local bup repositories -} - local bup repositories -}
--getBupUUID :: UUID -> FilePath -> Annex () getBupUUID :: FilePath -> UUID -> Annex UUID
--getBupUUID u buprepo = do getBupUUID buprepo u = do
return u -- TODO
{- Converts a bup remote path spec into a Git.Repo. There are some {- Converts a bup remote path spec into a Git.Repo. There are some
- differences in path representation between git and bup. -} - differences in path representation between git and bup. -}