Log message for revision 71864: Bug Fixed: The new (2.0) mechanism used by zdaemon to start the daemon manager broke some applications that extended zdaemon.
Changed: U zdaemon/trunk/CHANGES.txt U zdaemon/trunk/setup.py U zdaemon/trunk/src/zdaemon/zdctl.py -=- Modified: zdaemon/trunk/CHANGES.txt =================================================================== --- zdaemon/trunk/CHANGES.txt 2007-01-10 15:18:10 UTC (rev 71863) +++ zdaemon/trunk/CHANGES.txt 2007-01-10 15:19:06 UTC (rev 71864) @@ -1,6 +1,15 @@ zdaemon Changelog ***************** +zdaemon 2.0a4 (2007/01/10) +========================== + +Bugs Fixed +---------- + +- The new (2.0) mechanism used by zdaemon to start the daemon manager + broke some applications that extended zdaemon. + zdaemon 2.0a3 (2007/01/10) ========================== Modified: zdaemon/trunk/setup.py =================================================================== --- zdaemon/trunk/setup.py 2007-01-10 15:18:10 UTC (rev 71863) +++ zdaemon/trunk/setup.py 2007-01-10 15:19:06 UTC (rev 71864) @@ -37,7 +37,7 @@ name = "zdaemon" setup( name=name, - version="2.0a3", + version="2.0a4", url="http://www.python.org/pypi/zdaemon", license="ZPL 2.1", description= Modified: zdaemon/trunk/src/zdaemon/zdctl.py =================================================================== --- zdaemon/trunk/src/zdaemon/zdctl.py 2007-01-10 15:18:10 UTC (rev 71863) +++ zdaemon/trunk/src/zdaemon/zdctl.py 2007-01-10 15:19:06 UTC (rev 71864) @@ -222,7 +222,8 @@ if self.options.zdrun: args = [self.options.python, self.options.zdrun] else: - args = [self.options.python, sys.argv[0], '--zdrun'] + args = [self.options.python, sys.argv[0]] + os.environ['ZDAEMON_MODE'] = '1' args += self._get_override("-S", "schemafile") args += self._get_override("-C", "configfile") @@ -603,9 +604,10 @@ def main(args=None, options=None, cmdclass=ZDCmd): if args is None: args = sys.argv[1:] - if args[0] == '--zdrun': + + if os.environ.get('ZDAEMON_MODE'): import zdaemon.zdrun - return zdaemon.zdrun.main(args[1:]) + return zdaemon.zdrun.main(args) if options is None: options = ZDCtlOptions() _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins