Log message for revision 101795: - LP #397861: exporting $PYTHON in generated 'zopectl' for fixing import issue with "bin/zopectl adduser"
Changed: U Zope/trunk/doc/CHANGES.rst U Zope/trunk/src/Zope2/Startup/zopectl.py U Zope/trunk/src/Zope2/utilities/skel/bin/zopectl.in -=- Modified: Zope/trunk/doc/CHANGES.rst =================================================================== --- Zope/trunk/doc/CHANGES.rst 2009-07-10 15:09:03 UTC (rev 101794) +++ Zope/trunk/doc/CHANGES.rst 2009-07-10 15:11:08 UTC (rev 101795) @@ -47,3 +47,5 @@ Bugs Fixed ++++++++++ +- LP #397861: exporting $PYTHON in generated 'zopectl' for fixing import issue + with "bin/zopectl adduser" Modified: Zope/trunk/src/Zope2/Startup/zopectl.py =================================================================== --- Zope/trunk/src/Zope2/Startup/zopectl.py 2009-07-10 15:09:03 UTC (rev 101794) +++ Zope/trunk/src/Zope2/Startup/zopectl.py 2009-07-10 15:11:08 UTC (rev 101795) @@ -129,7 +129,7 @@ self.sockname = config.runner.socket_name else: self.sockname = os.path.join(self.clienthome, "zopectlsock") - self.python = config.python or sys.executable + self.python = os.environ.get('PYTHON', config.python) or sys.executable self.zdrun = os.path.join(os.path.dirname(zdaemon.__file__), "zdrun.py") if WIN: Modified: Zope/trunk/src/Zope2/utilities/skel/bin/zopectl.in =================================================================== --- Zope/trunk/src/Zope2/utilities/skel/bin/zopectl.in 2009-07-10 15:09:03 UTC (rev 101794) +++ Zope/trunk/src/Zope2/utilities/skel/bin/zopectl.in 2009-07-10 15:11:08 UTC (rev 101795) @@ -4,6 +4,7 @@ INSTANCE_HOME="<<INSTANCE_HOME>>" CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf" export INSTANCE_HOME +export PYTHON ZDCTL="<<ZOPE2PATH>>/Startup/zopectl.py" _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins