[MERGE][0.19] Fix passing tracefilename to bzrlib.open_tracefile

[Andrew Bennetts]

Currently, if you pass the 'tracefilename' argument to bzrlib.open_tracefile,
you get an exception.  This simple bundle fixes that.  It was working in 0.17,
I haven't checked 0.18.

This is a useful feature if you want to get logging when using bzrlib outside of
the 'bzr' executable, and don't want to direct it to ~/.bzr.log.

Unfortunately, with the current structure of bzrlib/trace.py, it is very
difficult to test this code path, so I have only tested this manually.

I think this is simple enough that it should go into 0.19, especially as it is a
regression.

-Andrew.

-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.19)
# revision_id: andrew.bennetts at canonical.com-20070809011436-\
#   gdrflmle4tsc00kl
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev
# testament_sha1: 2266dc20e699a6c6fdd878b6323794e564b5255d
# timestamp: 2007-08-09 11:14:50 +1000
# source_branch: http://people.ubuntu.com/~andrew/bzr/tracefilename-\
#   fix
# base_revision_id: pqm at pqm.ubuntu.com-20070808055516-ml9ucjsb4idmpmww
# 
# Begin patch
=== modified file 'bzrlib/trace.py'
--- bzrlib/trace.py	2007-07-02 04:48:41 +0000
+++ bzrlib/trace.py	2007-08-09 01:14:36 +0000
@@ -152,6 +152,8 @@
         else:
             home = os.path.expanduser('~')
         _bzr_log_filename = os.path.join(home, '.bzr.log')
+    else:
+        _bzr_log_filename = tracefilename
 
     _bzr_log_filename = os.path.expanduser(_bzr_log_filename)
     _rollover_trace_maybe(_bzr_log_filename)

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQydfmYAAehfgGQQUev//3//
/7C////wUAR9PaAMWhtgCGpomin6mGpPEaJ6RiZP1EHpD1Gmmhp5QHpoQBxkyaMQ00MBNDE0aZMQ
MjCaNNMIMmOMmTRiGmhgJoYmjTJiBkYTRpphBkwkkqfqT0m9UxNqfpBNGR6mTIABoaaAaNAAEkhN
AJ6mETAmQTSfpGUeU9RhPSaNMI2U2po+AmqzNHVyN6Y8qt6dnWpVvvngnjJ7T51G6+KzxELjrrSv
UFlGDJG11q6KMJEQ1/A17kuEFqW4k6ZZLkw0A+kxfizuQbIf2o5y+yArb2IAw6Y4Z7THrgRfImWA
Y92FAML2DJmkQaubr5JegQetdC+uJskC7tTEqgOVg3+HE+eXVxoNXkDAT1qaqhltGb3oSzOxohIK
Vml2ADgAsILxzUL6gozqfeE70KY0KLTBMC0uA7FApCH99PV1VyOznyEgJR90MCDQGU0v+tsgBQ9j
Li3Ee8ymAFVi3E4QZ5We6Hb56WYuIGThTV0gFc1Rjlia73v1kBxmKZyYtReVsRPDxhQrCg0FeZwG
iqJYaMhnkVHzrtU9BdIcBCwgPcZLFebnGakeXyCIFV0S8zZFvDc/EL7KjQqMCIOB15eONTs0Zrmq
AnCLnQuwKS22fMnFFolW57yYgOwGJmiFHydAYhOPcAVQKKPhXnKJxsCgd7er41mJQXFpCBkBPMMs
igtkbX7TN5Q1hVw7Ks0ma8qcxqBwYF6Ju02cx3ML3sY77bsWUGRQhomyOSsWATeaGzjeI6DmAnAe
x0yUBzcp8jERD0GXL1W3tCHZ+F6kon28og26b/r3QCs1DRoq+WWKyXsg0Ye2Q8bsAbCyExGpSbwW
pWKk3vJZUA/Lvhl5dAkt58akStVYnRmLIF1up2emJvLTvqiiz2Hrp3fcpPUEhdn5l9xBHcg/HFER
+a+tflTqKCJTS5MChh66hMWzIUiUMRMT2DqQd8segPJ3FQFYFljGc9veWHGTaMyDxQXlBMsrLbqn
gEHYoV27LfE6C7UYFiiFP7lRA81ote00/CWJ48hQFQjgB9d58BsFqf8TTsc54Gk3cnC2stNHCdmp
gj0y3FuV4eE64a0FsfouJwsmm92HlENJSTNmSKUgeBFrniAwCOq6LIQOjgEArdYw8xTQgCLc2Al9
gTjzlNYAYUqv1eufrnIg09mKuNG8VkDmqV0bYSESFpLOLFdFny8tb5qBHQg5vnXC+zOLn7m68Ecw
F6XGgaoLQ40wDBpJtxICnk33Hqo5UL7gZ3rlsF6tcjLvCwCu6ik3B9vQFU4vFgwW47aoo/hyCPs8
4ibLBA1IiKBhQYUg+jw1z5zDlEphHbYgnjawc6Hh+mL1Xv0npzmzZsCYnQwU4/sHriqKBuK5UAS0
EFjcLIjLkOadKzpL8jJ+8QWT2FYWZoSCMzDMOcpnsMyCbb2P4j8gcBtz3sX2lzti1sKFAapBQKmf
ZDfZMQ+xIY4VyU5jWPHzooXHqZ03g6lhkFHYA8MMohwSmIg/58gbesI7DzcoX4113dLlJBz/07vZ
BgcmCOBnhpQvpzm/sVkkJJV/i7kinChIBk6/MwA=