Author: Armin Rigo <ar...@tunes.org> Branch: Changeset: r47324:ec281c16101f Date: 2011-09-18 12:24 +0200 http://bitbucket.org/pypy/pypy/changeset/ec281c16101f/
Log: merge heads diff --git a/pypy/tool/logparser.py b/pypy/tool/logparser.py --- a/pypy/tool/logparser.py +++ b/pypy/tool/logparser.py @@ -75,9 +75,9 @@ if verbose: sys.stderr.write('loaded\n') if performance_log and time_decrase: - raise Exception("The time decreases! The log file may have been" - " produced on a multi-CPU machine and the process" - " moved between CPUs.") + print ("The time decreases! The log file may have been" + " produced on a multi-CPU machine and the process" + " moved between CPUs.") return log def extract_category(log, catprefix='', toplevel=False): _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit