equal
deleted
inserted
replaced
502 |
502 |
503 cmd = '/bin/sh "%s"' % name |
503 cmd = '/bin/sh "%s"' % name |
504 vlog("# Running", cmd) |
504 vlog("# Running", cmd) |
505 exitcode, output = run(cmd, options, replacements) |
505 exitcode, output = run(cmd, options, replacements) |
506 # do not merge output if skipped, return hghave message instead |
506 # do not merge output if skipped, return hghave message instead |
507 if exitcode == SKIPPED_STATUS: |
507 # similarly, with --debug, output is None |
|
508 if exitcode == SKIPPED_STATUS or output is None: |
508 return exitcode, output |
509 return exitcode, output |
509 finally: |
510 finally: |
510 os.remove(name) |
511 os.remove(name) |
511 |
512 |
512 def rematch(el, l): |
513 def rematch(el, l): |