[Zope-Checkins] SVN: Zope/branches/2.12/src/Zope2/Startup/zopectl.py use sys.exit()

2009-07-10 Thread Andreas Jung 
Log message for revision 101796:
  use sys.exit()
  

Changed:
  U   Zope/branches/2.12/src/Zope2/Startup/zopectl.py

-=-
Modified: Zope/branches/2.12/src/Zope2/Startup/zopectl.py
===
--- Zope/branches/2.12/src/Zope2/Startup/zopectl.py 2009-07-10 15:11:08 UTC 
(rev 101795)
+++ Zope/branches/2.12/src/Zope2/Startup/zopectl.py 2009-07-10 15:15:37 UTC 
(rev 101796)
@@ -346,4 +346,4 @@
 # signal handler at all.
 signal.signal(signal.SIGCHLD, _ignoreSIGCHLD)
 exitstatus = main()
-exit(exitstatus)
+sys.exit(exitstatus)

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/ - LP #397861: exporting $PYTHON in generated 'zopectl' for fixing import issue

2009-07-10 Thread Andreas Jung 
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="<>"
 CONFIG_FILE="<>/etc/zope.conf"
 export INSTANCE_HOME
+export PYTHON
 
 ZDCTL="<>/Startup/zopectl.py"
 

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.12/ - LP #397861: exporting $PYTHON in generated 'zopectl' for fixing import issue

2009-07-10 Thread Andreas Jung 
Log message for revision 101794:
  - LP #397861: exporting $PYTHON in generated 'zopectl' for fixing import issue
with "bin/zopectl adduser"
  

Changed:
  U   Zope/branches/2.12/doc/CHANGES.rst
  U   Zope/branches/2.12/src/Zope2/Startup/zopectl.py
  U   Zope/branches/2.12/src/Zope2/utilities/skel/bin/zopectl.in

-=-
Modified: Zope/branches/2.12/doc/CHANGES.rst
===
--- Zope/branches/2.12/doc/CHANGES.rst  2009-07-10 14:54:30 UTC (rev 101793)
+++ Zope/branches/2.12/doc/CHANGES.rst  2009-07-10 15:09:03 UTC (rev 101794)
@@ -28,6 +28,9 @@
 Bugs Fixed
 ++
 
+- LP #397861: exporting $PYTHON in generated 'zopectl' for fixing import issue
+  with "bin/zopectl adduser"
+
 - PluginIndexes: Added 'indexSize' to IPluggableIndex.
 
 - HelpSys: ProductHelp no longer depends on PluginIndexes initialization.

Modified: Zope/branches/2.12/src/Zope2/Startup/zopectl.py
===
--- Zope/branches/2.12/src/Zope2/Startup/zopectl.py 2009-07-10 14:54:30 UTC 
(rev 101793)
+++ Zope/branches/2.12/src/Zope2/Startup/zopectl.py 2009-07-10 15:09:03 UTC 
(rev 101794)
@@ -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:
@@ -346,4 +346,4 @@
 # signal handler at all.
 signal.signal(signal.SIGCHLD, _ignoreSIGCHLD)
 exitstatus = main()
-sys.exit(exitstatus)
+exit(exitstatus)

Modified: Zope/branches/2.12/src/Zope2/utilities/skel/bin/zopectl.in
===
--- Zope/branches/2.12/src/Zope2/utilities/skel/bin/zopectl.in  2009-07-10 
14:54:30 UTC (rev 101793)
+++ Zope/branches/2.12/src/Zope2/utilities/skel/bin/zopectl.in  2009-07-10 
15:09:03 UTC (rev 101794)
@@ -4,6 +4,7 @@
 INSTANCE_HOME="<>"
 CONFIG_FILE="<>/etc/zope.conf"
 export INSTANCE_HOME
+export PYTHON
 
 ZDCTL="<>/Startup/zopectl.py"
 

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins