equal
deleted
inserted
replaced
71 except SubrepoAbort as ex: |
71 except SubrepoAbort as ex: |
72 # This exception has already been handled |
72 # This exception has already been handled |
73 raise ex |
73 raise ex |
74 except error.Abort as ex: |
74 except error.Abort as ex: |
75 subrepo = subrelpath(self) |
75 subrepo = subrelpath(self) |
76 errormsg = str(ex) + ' ' + _('(in subrepository "%s")') % subrepo |
76 errormsg = (util.forcebytestr(ex) + ' ' |
|
77 + _('(in subrepository "%s")') % subrepo) |
77 # avoid handling this exception by raising a SubrepoAbort exception |
78 # avoid handling this exception by raising a SubrepoAbort exception |
78 raise SubrepoAbort(errormsg, hint=ex.hint, subrepo=subrepo, |
79 raise SubrepoAbort(errormsg, hint=ex.hint, subrepo=subrepo, |
79 cause=sys.exc_info()) |
80 cause=sys.exc_info()) |
80 return res |
81 return res |
81 return decoratedmethod |
82 return decoratedmethod |