From f5da5343a4a35d99e589a5f26cd3665d1856ac8b Mon Sep 17 00:00:00 2001 From: Ian Bicking Date: Thu, 6 Nov 2008 15:00:07 -0600 Subject: [PATCH] [svn r21281] Added support for some hidden settings, PIP_LOG_EXPLICIT_LEVELS and PIP_DEFAULT_VCS, for backward compatibility with poacheggs --- pip.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pip.py b/pip.py index a2060dc61..35ec29433 100755 --- a/pip.py +++ b/pip.py @@ -49,6 +49,11 @@ pypi_url = "http://pypi.python.org/simple" default_timeout = 15 +## FIXME: this shouldn't be a module setting +default_vcs = None +if os.environ.get('PIP_DEFAULT_VCS'): + default_vcs = os.environ['PIP_DEFAULT_VCS'] + try: pip_dist = pkg_resources.get_distribution('pip') version = '%s from %s (python %s)' % ( @@ -146,6 +151,8 @@ class Command(object): complete_log = [] logger = Logger([(level, sys.stdout), (Logger.DEBUG, complete_log.append)]) + if os.environ.get('PIP_LOG_EXPLICIT_LEVELS'): + logger.explicit_levels = True if options.venv: if options.verbose > 0: # The logger isn't setup yet @@ -2535,6 +2542,7 @@ class Logger(object): def __init__(self, consumers): self.consumers = consumers self.indent = 0 + self.explicit_levels = False self.in_progress = None self.in_progress_hanging = False @@ -2570,6 +2578,9 @@ class Logger(object): else: rendered = msg rendered = ' '*self.indent + rendered + if self.explicit_levels: + ## FIXME: should this be a name, not a level number? + rendered = '%02i %s' % (level, rendered) if hasattr(consumer, 'write'): consumer.write(rendered+'\n') else: @@ -2863,8 +2874,11 @@ def parse_editable(editable_req): if url.lower().startswith('svn:'): url = 'svn+' + url if '+' not in url: - raise InstallationError( - '--editable=%s should be formatted with svn+URL' % editable_req) + if default_vcs: + url = default_vcs + '+' + url + else: + raise InstallationError( + '--editable=%s should be formatted with svn+URL' % editable_req) vc_type = url.split('+', 1)[0].lower() if vc_type != 'svn': raise InstallationError(