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

bugfix for uuid lookup

Browse source
This commit is contained in:
Joey Hess 2011-04-01 12:19:26 -04:00
parent cbabee36e1
commit bf1e2205a4
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
GitQueue.hs
View file

@ -60,8 +60,7 @@ run repo (Queue _ m) = do
- -
- Complicated by commandline length limits. -} - Complicated by commandline length limits. -}
runAction :: Git.Repo -> Action -> [FilePath] -> IO () runAction :: Git.Repo -> Action -> [FilePath] -> IO ()
runAction repo action files = do runAction repo action files = unless (null files) runxargs
unless (null files) runxargs
where where
runxargs = pOpen WriteToPipe "xargs" ("-0":"git":params) feedxargs runxargs = pOpen WriteToPipe "xargs" ("-0":"git":params) feedxargs
params = toCommand $ Git.gitCommandLine repo params = toCommand $ Git.gitCommandLine repo

4
Remote/Git.hs
View file

@ -54,13 +54,15 @@ gen r u _ = do
(False, "") -> tryGitConfigRead r (False, "") -> tryGitConfigRead r
_ -> return r _ -> return r
u' <- getUUID r'
let defcst = if not $ Git.repoIsUrl r let defcst = if not $ Git.repoIsUrl r
then cheapRemoteCost then cheapRemoteCost
else expensiveRemoteCost else expensiveRemoteCost
cst <- remoteCost r' defcst cst <- remoteCost r' defcst
return $ Remote { return $ Remote {
uuid = u, uuid = u',
cost = cst, cost = cst,
name = Git.repoDescribe r', name = Git.repoDescribe r',
storeKey = copyToRemote r', storeKey = copyToRemote r',