Rev 4683: (jam) If -Dmemory is set, dump memory info, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4683 [merge]
revision-id: pqm at pqm.ubuntu.com-20090910042032-r24kxnlc0ub231kj
parent: pqm at pqm.ubuntu.com-20090909162106-ar32j79ayhfrkap3
parent: john at arbash-meinel.com-20090909175119-2q9o6i26x540swkn
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-09-10 05:20:32 +0100
message:
  (jam) If -Dmemory is set, dump memory info,
  	even if there is an exception.
modified:
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2009-06-19 09:06:56 +0000
+++ b/bzrlib/commands.py	2009-09-09 17:51:19 +0000
@@ -1028,13 +1028,13 @@
             ret = apply_coveraged(opt_coverage_dir, run, *run_argv)
         else:
             ret = run(*run_argv)
-        if 'memory' in debug.debug_flags:
-            trace.debug_memory('Process status after command:', short=False)
         return ret or 0
     finally:
         # reset, in case we may do other commands later within the same
         # process. Commands that want to execute sub-commands must propagate
         # --verbose in their own way.
+        if 'memory' in debug.debug_flags:
+            trace.debug_memory('Process status after command:', short=False)
         option._verbosity_level = saved_verbosity_level