diff options
author | Joey Hess <joey@kitenet.net> | 2011-04-01 12:19:26 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-04-01 12:19:26 -0400 |
commit | bf1e2205a4af4b490d5dd284a411bd180d8d6c9d (patch) | |
tree | 6ed4b381f5978c0d72b91192e30e5ef3bd38e35e | |
parent | cbabee36e1e794096ad0693d6f65467fc7936894 (diff) |
bugfix for uuid lookup
-rw-r--r-- | GitQueue.hs | 3 | ||||
-rw-r--r-- | Remote/Git.hs | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/GitQueue.hs b/GitQueue.hs index 097516c19..dfe2976da 100644 --- a/GitQueue.hs +++ b/GitQueue.hs @@ -60,8 +60,7 @@ run repo (Queue _ m) = do - - Complicated by commandline length limits. -} runAction :: Git.Repo -> Action -> [FilePath] -> IO () -runAction repo action files = do - unless (null files) runxargs +runAction repo action files = unless (null files) runxargs where runxargs = pOpen WriteToPipe "xargs" ("-0":"git":params) feedxargs params = toCommand $ Git.gitCommandLine repo diff --git a/Remote/Git.hs b/Remote/Git.hs index c1423bef7..a45845510 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -54,13 +54,15 @@ gen r u _ = do (False, "") -> tryGitConfigRead r _ -> return r + u' <- getUUID r' + let defcst = if not $ Git.repoIsUrl r then cheapRemoteCost else expensiveRemoteCost cst <- remoteCost r' defcst return $ Remote { - uuid = u, + uuid = u', cost = cst, name = Git.repoDescribe r', storeKey = copyToRemote r', |