← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzr

Change the use of run_bzr to run_bzr_captured in blackbox tests - inspired by David Clymers patch to change run_bzr usage to runbzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzr
43
43
if hasattr(os, "unsetenv"):
44
44
    os.unsetenv(REINVOKE)
45
45
 
46
 
try:
47
 
    import bzrlib
48
 
    import bzrlib.commands
49
 
    import bzrlib.trace
50
 
except ImportError, e:
51
 
    sys.stderr.write("bzr: ERROR: "
52
 
                     "Couldn't import bzrlib and dependencies.\n"
53
 
                     "Please check bzrlib is on your PYTHONPATH.\n"
54
 
                     "\n")
55
 
    raise
 
46
import bzrlib
 
47
import bzrlib.commands
 
48
import bzrlib.trace
56
49
 
57
50
if __name__ == '__main__':
58
51
    bzrlib.trace.enable_default_logging()
59
52
    sys.exit(bzrlib.commands.main(sys.argv))
60
 
else:
61
 
    pass    # should this give an error? - it can't be used as a lib