[Zope-Checkins] SVN: Zope/branches/2.10/ fix for Collector #2206

[david whitfield Morriss]

Log message for revision 70714:
  fix for Collector #2206

Changed:
  U   Zope/branches/2.10/doc/CHANGES.txt
  U   Zope/branches/2.10/skel/bin/runzope.in
  U   Zope/branches/2.10/skel/bin/zopectl.in

-=-
Modified: Zope/branches/2.10/doc/CHANGES.txt
===================================================================
--- Zope/branches/2.10/doc/CHANGES.txt	2006-10-16 16:22:38 UTC (rev 70713)
+++ Zope/branches/2.10/doc/CHANGES.txt	2006-10-16 16:36:28 UTC (rev 70714)
@@ -13,7 +13,10 @@
 
       - Collector #2209: ZTUtils module could not be used inside ZPT
 
+      - Collector #2206: Set PYTHONPATH to include existing PYTHONPATH
+        in skel/bin/zopectl.in and skel/bin/runzope.in
 
+
   Zope 2.10.0 (2006/10/04)
 
     Bugs fixed

Modified: Zope/branches/2.10/skel/bin/runzope.in
===================================================================
--- Zope/branches/2.10/skel/bin/runzope.in	2006-10-16 16:22:38 UTC (rev 70713)
+++ Zope/branches/2.10/skel/bin/runzope.in	2006-10-16 16:36:28 UTC (rev 70714)
@@ -5,7 +5,7 @@
 INSTANCE_HOME="<<INSTANCE_HOME>>"
 CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf"
 SOFTWARE_HOME="<<SOFTWARE_HOME>>"
-PYTHONPATH="$SOFTWARE_HOME"
+PYTHONPATH="$SOFTWARE_HOME:$PYTHONPATH"
 export PYTHONPATH INSTANCE_HOME SOFTWARE_HOME
 
 ZOPE_RUN="$SOFTWARE_HOME/Zope2/Startup/run.py"

Modified: Zope/branches/2.10/skel/bin/zopectl.in
===================================================================
--- Zope/branches/2.10/skel/bin/zopectl.in	2006-10-16 16:22:38 UTC (rev 70713)
+++ Zope/branches/2.10/skel/bin/zopectl.in	2006-10-16 16:36:28 UTC (rev 70714)
@@ -5,7 +5,7 @@
 INSTANCE_HOME="<<INSTANCE_HOME>>"
 CONFIG_FILE="<<INSTANCE_HOME>>/etc/zope.conf"
 SOFTWARE_HOME="<<SOFTWARE_HOME>>"
-PYTHONPATH="$SOFTWARE_HOME"
+PYTHONPATH="$SOFTWARE_HOME:$PYTHONPATH"
 export PYTHONPATH INSTANCE_HOME SOFTWARE_HOME
 
 ZDCTL="$SOFTWARE_HOME/Zope2/Startup/zopectl.py"