[pypy-svn] r11511 - pypy/dist/pypy/interpreter

[hpk at codespeak.net]

Author: hpk
Date: Wed Apr 27 14:22:36 2005
New Revision: 11511

Modified:
   pypy/dist/pypy/interpreter/py.py
Log:
- return a minimum-useful exitstatus != 0 from
  invocations of py.py 



Modified: pypy/dist/pypy/interpreter/py.py
==============================================================================
--- pypy/dist/pypy/interpreter/py.py	(original)
+++ pypy/dist/pypy/interpreter/py.py	Wed Apr 27 14:22:36 2005
@@ -55,6 +55,9 @@
     from pypy.tool import tb_server
     args = option.process_options(get_main_options(), Options, argv[1:])
     space = None
+    exit_status = 1   # until proven otherwise
+                      # XXX should review what CPython's policy is for
+                      # the exit status code
     try:
         space = option.objspace()
         space._starttime = starttime
@@ -77,6 +80,7 @@
                 space.call_method(space.sys.get('argv'), 'append', space.wrap(''))
                 go_interactive = 1
                 banner = None
+            exit_status = 0
         except error.OperationError, operationerr:
             if Options.verbose:
                 operationerr.print_detailed_traceback(space)
@@ -100,8 +104,10 @@
         else:
             sys.excepthook(exc_type, value, tb)
         tb_server.wait_until_interrupt()
+        exit_status = 1
             
     tb_server.stop()
+    return exit_status
 
 if __name__ == '__main__':
     try:
@@ -111,4 +117,4 @@
     if hasattr(sys, 'setrecursionlimit'):
         # for running "python -i py.py -Si -- py.py -Si" 
         sys.setrecursionlimit(3000)
-    main_(sys.argv)
+    sys.exit(main_(sys.argv))