-def force_tty():
- if fix_stdout or fix_stderr:
- amt = (fix_stdout and 1 or 0) + (fix_stderr and 2 or 0)
- os.environ['BUP_FORCE_TTY'] = str(amt)
+if fix_stdout or fix_stderr:
+ tty_env = merge_dict(os.environ,
+ {'BUP_FORCE_TTY': str((fix_stdout and 1 or 0)
+ + (fix_stderr and 2 or 0))})
+else:
+ tty_env = os.environ