[pypy-svn] pypy commit 684c67725d60: Fix (hard to test). After translation, doing e.g. "pypy -h" would

Bitbucket commits-noreply at bitbucket.org
Wed Dec 15 11:34:01 CET 2010


# HG changeset patch -- Bitbucket.org
# Project pypy
# URL http://bitbucket.org/pypy/pypy/overview
# User Armin Rigo <arigo at tunes.org>
# Date 1292409230 -3600
# Node ID 684c67725d60fbcb765f4ca76227fa9ae47a1417
# Parent  84e43c98862c993e13c50de1774261b14dffddad
Fix (hard to test).  After translation, doing e.g. "pypy -h" would
print the help but also the lines:

    debug: OperationError:
    debug:  operror-type: SystemExit
    debug:  operror-value:

--- a/pypy/translator/goal/app_main.py
+++ b/pypy/translator/goal/app_main.py
@@ -585,6 +585,8 @@ def entry_point(executable, argv, nanos)
     except CommandLineError, e:
         print_error(str(e))
         return 2
+    except SystemExit, e:
+        return e.code or 0
     setup_initial_paths(**cmdline)
     return run_command_line(**cmdline)



More information about the Pypy-commit mailing list