Log message for revision 85726: Merge branches/slinkp-zopectl-exitcode-143813: Fixes bug 143813, zopectl should exit non-zero if child processes fail.
Changed: U Zope/trunk/lib/python/Zope2/Startup/zopectl.py -=- Modified: Zope/trunk/lib/python/Zope2/Startup/zopectl.py =================================================================== --- Zope/trunk/lib/python/Zope2/Startup/zopectl.py 2008-04-25 17:02:19 UTC (rev 85725) +++ Zope/trunk/lib/python/Zope2/Startup/zopectl.py 2008-04-25 17:07:36 UTC (rev 85726) @@ -147,6 +147,8 @@ class ZopeCmd(ZDCmd): + _exitstatus = 0 + def _get_override(self, opt, name, svalue=None, flag=0): # Suppress the config file, and pass all configuration via the # command line. This avoids needing to specialize the zdrun @@ -265,7 +267,7 @@ cmd += '[sys.argv.append(x) for x in %s];' % argv cmd += 'import Zope2; app=Zope2.app(); execfile(\'%s\')' % script cmdline = self.get_startup_cmd(self.options.python, cmd) - os.system(cmdline) + self._exitstatus = os.system(cmdline) def help_run(self): print "run <script> [args] -- run a Python script with the Zope " @@ -335,10 +337,11 @@ # Parent process running (execv replaces process in child while True: try: - os.waitpid(pid, 0) + pid, status = os.waitpid(pid, 0) except (OSError, KeyboardInterrupt): continue else: + self._exitstatus = status break def help_test(self): @@ -364,6 +367,8 @@ print "program:", " ".join(options.program) c.do_status() c.cmdloop() + else: + return min(c._exitstatus, 1) def _ignoreSIGCHLD(*unused): while 1: @@ -393,4 +398,5 @@ # SIGCHILD is unset, just don't bother registering a SIGCHILD # signal handler at all. signal.signal(signal.SIGCHLD, _ignoreSIGCHLD) - main() + exitstatus = main() + sys.exit(exitstatus) _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins