# after running 'bup newliner', the tty_width() ioctl won't work anymore
os.environ['WIDTH'] = str(tty_width())
-def usage():
- log('Usage: bup [-?|--help] [-d BUP_DIR] [--debug] '
+def usage(msg=""):
+ log('Usage: bup [-?|--help] [-d BUP_DIR] [--debug] [--profile] '
'<command> [options...]\n\n')
common = dict(
ftp = 'Browse backup sets using an ftp-like client',
log("See 'bup help COMMAND' for more information on " +
"a specific command.\n")
+ if msg:
+ log("\n%s\n" % msg)
sys.exit(99)
# Handle global options.
try:
- global_args, subcmd = getopt.getopt(argv[1:], '?VDd:',
- ['help', 'version', 'debug', 'bup-dir='])
+ optspec = ['help', 'version', 'debug', 'profile', 'bup-dir=']
+ global_args, subcmd = getopt.getopt(argv[1:], '?VDd:', optspec)
except getopt.GetoptError, ex:
- log('error: ' + ex.msg + '\n')
- usage()
+ usage('error: %s' % ex.msg)
help_requested = None
dest_dir = None
+do_profile = False
for opt in global_args:
if opt[0] in ['-?', '--help']:
elif opt[0] in ['-D', '--debug']:
helpers.buglvl += 1
os.environ['BUP_DEBUG'] = str(helpers.buglvl)
+ elif opt[0] in ['--profile']:
+ do_profile = True
elif opt[0] in ['-d', '--bup-dir']:
dest_dir = opt[1]
else:
- log('error: unexpected option "%s"\n' % opt[0])
- usage()
+ usage('error: unexpected option "%s"' % opt[0])
if len(subcmd) == 0:
if help_requested:
sp = os.path.join(cmdpath, 'bup-%s' % s)
return sp
-if not os.path.exists(subpath(subcmd_name)):
- log('error: unknown command "%s"\n' % subcmd_name)
- usage()
+subcmd[0] = subpath(subcmd_name)
+if not os.path.exists(subcmd[0]):
+ usage('error: unknown command "%s"' % subcmd_name)
already_fixed = atoi(os.environ.get('BUP_FORCE_TTY'))
-if subcmd_name in ['ftp', 'help']:
+if subcmd_name in ['mux', 'ftp', 'help']:
already_fixed = True
fix_stdout = not already_fixed and os.isatty(1)
fix_stderr = not already_fixed and os.isatty(2)
p = None
try:
try:
- p = subprocess.Popen([subpath(subcmd_name)] + subcmd[1:],
- stdout=outf, stderr=errf, preexec_fn=force_tty)
+ c = (do_profile and [sys.executable, '-m', 'cProfile'] or []) + subcmd
+ if not n and not outf and not errf:
+ # shortcut when no bup-newliner stuff is needed
+ os.execvp(c[0], c)
+ else:
+ p = subprocess.Popen(c, stdout=outf, stderr=errf,
+ preexec_fn=force_tty)
while 1:
# if we get a signal while waiting, we have to keep waiting, just
# in case our child doesn't die.
os.kill(p.pid, e.signum)
ret = 94
except OSError, e:
- log('%s: %s\n' % (subpath(subcmd_name), e))
+ log('%s: %s\n' % (subcmd[0], e))
ret = 98
finally:
if p and p.poll() == None: