summaryrefslogtreecommitdiff
path: root/Remote
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-05-03 12:53:42 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-05-03 12:53:42 -0400
commit9abbec6d9b9ab1af73e2aa1eec19e4c31b3974cb (patch)
tree6f129bcb612c7032dcde2443ede00c0555b2cf9b /Remote
parent169057740d3f5affa6a556f0b0b2819e3d45da35 (diff)
Improve behavior when a just added http remote is not available during uuid probe. Do not mark it as annex-ignore, so it will be tried again later.
Diffstat (limited to 'Remote')
-rw-r--r--Remote/Git.hs11
1 files changed, 7 insertions, 4 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs
index a0992957c..627a6066b 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -233,14 +233,17 @@ tryGitConfigRead autoinit r
hClose h
let url = Git.repoLocation r ++ "/config"
ifM (Url.downloadQuiet url tmpfile uo)
- ( pipedconfig "git" [Param "config", Param "--null", Param "--list", Param "--file", File tmpfile]
- , return $ Left $ error $ "unable to load config from " ++ url
+ ( Just <$> pipedconfig "git" [Param "config", Param "--null", Param "--list", Param "--file", File tmpfile]
+ , return Nothing
)
case v of
- Left _ -> do
+ Nothing -> do
+ warning $ "Failed to get annex.uuid configuration of repository " ++ Git.repoDescribe r
+ return r
+ Just (Left _) -> do
set_ignore "not usable by git-annex" False
return r
- Right r' -> do
+ Just (Right r') -> do
-- Cache when http remote is not bare for
-- optimisation.
unless (Git.Config.isBare r') $