From ad3193a0e587073dee0edef46bdf24f6c6e09779 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Sat, 18 Apr 2009 09:54:51 -0700 Subject: Fix `repo --trace` to show ref and config loads The value of the varible TRACE was copied during the import, which happens before the --trace option can be processed. So instead we now use a function to determine if the value is set, as the function can be safely copied early during import. Signed-off-by: Shawn O. Pearce --- git_command.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'git_command.py') diff --git a/git_command.py b/git_command.py index a3bd9192..b6a4a343 100644 --- a/git_command.py +++ b/git_command.py @@ -17,18 +17,14 @@ import os import sys import subprocess from error import GitError +from trace import REPO_TRACE, IsTrace, Trace GIT = 'git' MIN_GIT_VERSION = (1, 5, 4) GIT_DIR = 'GIT_DIR' -REPO_TRACE = 'REPO_TRACE' LAST_GITDIR = None LAST_CWD = None -try: - TRACE = os.environ[REPO_TRACE] == '1' -except KeyError: - TRACE = False class _GitCall(object): @@ -101,7 +97,7 @@ class GitCommand(object): else: stderr = None - if TRACE: + if IsTrace(): global LAST_CWD global LAST_GITDIR @@ -127,7 +123,7 @@ class GitCommand(object): dbg += ' 1>|' if stderr == subprocess.PIPE: dbg += ' 2>|' - print >>sys.stderr, dbg + Trace('%s', dbg) try: p = subprocess.Popen(command, -- cgit v1.2.3-54-g00ecf