equal
deleted
inserted
replaced
27 except SubrepoAbort, ex: |
27 except SubrepoAbort, ex: |
28 # This exception has already been handled |
28 # This exception has already been handled |
29 raise ex |
29 raise ex |
30 except error.Abort, ex: |
30 except error.Abort, ex: |
31 subrepo = subrelpath(self) |
31 subrepo = subrelpath(self) |
32 errormsg = _('%s (in subrepo %s)') % (str(ex), subrepo) |
32 errormsg = str(ex) + ' ' + _('(in subrepo %s)') % subrepo |
33 # avoid handling this exception by raising a SubrepoAbort exception |
33 # avoid handling this exception by raising a SubrepoAbort exception |
34 raise SubrepoAbort(errormsg, hint=ex.hint, subrepo=subrepo) |
34 raise SubrepoAbort(errormsg, hint=ex.hint, subrepo=subrepo) |
35 return res |
35 return res |
36 return decoratedmethod |
36 return decoratedmethod |
37 |
37 |