Mercurial > public > mercurial-scm > hg-stable

diff mercurial/utils/procutil.py @ 37461:538353b80676

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
procutil: fix error message of tempfile filter First, we need to use procutil.system() to get an exit code compatible with explainexit(). Second, explainexit() returns (msg, code) tuple.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 07 Apr 2018 21:17:50 +0900
parents a6c6b7beb025
children c0d0fd87ba7c
line wrap: on
line diff
--- a/mercurial/utils/procutil.py	Sat Apr 07 21:14:16 2018 +0900
+++ b/mercurial/utils/procutil.py	Sat Apr 07 21:17:50 2018 +0900
@@ -174,12 +174,12 @@
         os.close(outfd)
         cmd = cmd.replace('INFILE', inname)
         cmd = cmd.replace('OUTFILE', outname)
-        code = os.system(cmd)
+        code = system(cmd)
         if pycompat.sysplatform == 'OpenVMS' and code & 1:
             code = 0
         if code:
             raise error.Abort(_("command '%s' failed: %s") %
-                              (cmd, explainexit(code)))
+                              (cmd, explainexit(code)[0]))
         with open(outname, 'rb') as fp:
             return fp.read()
     finally: