httprepo: use the original exception after falling back to static-http failed

Before the fine exception handling in httprepo was never shown.

The static-http exception will now only be shown when static-http is requested
explicitly.
This commit is contained in:
Mads Kiilerich 2011-03-07 22:50:55 +01:00
parent d27df0bd40
commit e24ddf937d

View File

@ -224,6 +224,10 @@ def instance(ui, path, create):
# No luck, try older compatibility check.
inst.between([(nullid, nullid)])
return inst
except error.RepoError:
ui.note('(falling back to static-http)\n')
return statichttprepo.instance(ui, "static-" + path, create)
except error.RepoError, httpexception:
try:
r = statichttprepo.instance(ui, "static-" + path, create)
ui.note('(falling back to static-http)\n')
return r
except error.RepoError:
raise httpexception # use the original http RepoError instead