Commit 405478c9 authored by Tarek Ziadé's avatar Tarek Ziadé

using log.warn for sys.stderr

parent 48a18744
......@@ -352,9 +352,8 @@ class Command:
# -- External world manipulation -----------------------------------
def warn (self, msg):
sys.stderr.write("warning: %s: %s\n" %
(self.get_command_name(), msg))
log.warn("warning: %s: %s\n" %
(self.get_command_name(), msg))
def execute (self, func, args, msg=None, level=1):
util.execute(func, args, msg, dry_run=self.dry_run)
......
......@@ -18,13 +18,14 @@ class Log:
def _log(self, level, msg, args):
if level >= self.threshold:
if not args:
# msg may contain a '%'. If args is empty,
# don't even try to string-format
print msg
if args:
msg = msg % args
if level in (WARN, ERROR, FATAL):
stream = sys.stderr
else:
print msg % args
sys.stdout.flush()
stream = sys.stdout
stream.write('%s\n' % msg)
stream.flush()
def log(self, level, msg, *args):
self._log(level, msg, args)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment