summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--py/python/Ice.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index e4bdad94cd8..8c35af2faa8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -74,6 +74,9 @@ Python Changes
- Fixed a bug in which destroyed Communicator instances were not being
garbage collected.
+- Fixed a bug in Ice.Application in which the exit status was not
+ properly returned from main().
+
======================================================================
Changes since version 3.4b
diff --git a/py/python/Ice.py b/py/python/Ice.py
index aeead0e5bcc..871e6b6c929 100644
--- a/py/python/Ice.py
+++ b/py/python/Ice.py
@@ -1028,7 +1028,7 @@ value is an integer representing the exit status.
return status
def doMain(self, args, initData):
- self.run(args)
+ return self.run(args)
def run(self, args):
'''This method must be overridden in a subclass. The base