Rev 2692: (Andrew Bennetts) Fix bzrlib.opentracefile('foo'). in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2692
revision-id: pqm at pqm.ubuntu.com-20070810055236-5viugoz9x2besqh3
parent: pqm at pqm.ubuntu.com-20070810032951-lfyztl72xe81b2uo
parent: andrew.bennetts at canonical.com-20070809011436-gdrflmle4tsc00kl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-08-10 06:52:36 +0100
message:
  (Andrew Bennetts) Fix bzrlib.opentracefile('foo').
modified:
  bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
    ------------------------------------------------------------
    revno: 2684.1.1
    merged: andrew.bennetts at canonical.com-20070809011436-gdrflmle4tsc00kl
    parent: pqm at pqm.ubuntu.com-20070808055516-ml9ucjsb4idmpmww
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: tracefilename-fix
    timestamp: Thu 2007-08-09 11:14:36 +1000
    message:
      Fix bzrlib.opentracefile('foo').
=== modified file 'bzrlib/trace.py'
--- a/bzrlib/trace.py	2007-07-02 04:48:41 +0000
+++ b/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)