equal
deleted
inserted
replaced
20 elif os.WIFSTOPPED(code): |
20 elif os.WIFSTOPPED(code): |
21 val = os.STOPSIG(code) |
21 val = os.STOPSIG(code) |
22 return "stopped by signal %d" % val, val |
22 return "stopped by signal %d" % val, val |
23 raise ValueError("invalid exit code") |
23 raise ValueError("invalid exit code") |
24 |
24 |
25 def system(cmd, errprefix = "abort"): |
25 def system(cmd, errprefix=None): |
26 """execute a shell command that must succeed""" |
26 """execute a shell command that must succeed""" |
27 rc = os.system(cmd) |
27 rc = os.system(cmd) |
28 if rc: |
28 if rc: |
29 errmsg = "%s: %s %s" % (errprefix, os.path.basename(cmd.split(None, 1)[0]), |
29 errmsg = "%s %s" % (os.path.basename(cmd.split(None, 1)[0]), |
30 explain_exit(rc)[0]) |
30 explain_exit(rc)[0]) |
|
31 if errprefix: |
|
32 errmsg = "%s: %s" % (errprefix, errmsg) |
31 raise CommandError(errmsg) |
33 raise CommandError(errmsg) |
32 |
34 |
33 def rename(src, dst): |
35 def rename(src, dst): |
34 try: |
36 try: |
35 os.rename(src, dst) |
37 os.rename(src, dst) |