##// END OF EJS Templates
Merge with stable
Martin Geisler -
r11054:355a7535 merge default
parent child Browse files
Show More
@@ -105,8 +105,8 b' def _runcatch(ui, args):'
105 except util.Abort, inst:
105 except util.Abort, inst:
106 ui.warn(_("abort: %s\n") % inst)
106 ui.warn(_("abort: %s\n") % inst)
107 except ImportError, inst:
107 except ImportError, inst:
108 ui.warn(_("abort: %s!\n") % inst)
108 m = str(inst).split()[-1]
109 m = str(inst).split()[-1]
109 ui.warn(_("abort: could not import module %s!\n") % m)
110 if m in "mpatch bdiff".split():
110 if m in "mpatch bdiff".split():
111 ui.warn(_("(did you forget to compile extensions?)\n"))
111 ui.warn(_("(did you forget to compile extensions?)\n"))
112 elif m in "zlib".split():
112 elif m in "zlib".split():
General Comments 0
You need to be logged in to leave comments. Login now