fix for Collector #2206

0d6d0fe6 · David Whitfield Morriss · c4af5a79 · 0d6d0fe6 · 0d6d0fe6 · 0d6d0fe6
Commit 0d6d0fe6 authored Oct 16, 2006 by David Whitfield Morriss
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

doc/CHANGES.txt doc/CHANGES.txt +3 -0

skel/bin/runzope.in skel/bin/runzope.in +1 -1

skel/bin/zopectl.in skel/bin/zopectl.in +1 -1

No files found.
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -13,6 +13,9 @@ Zope Changes

      - 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)


--- a/skel/bin/runzope.in
+++ b/skel/bin/runzope.in
@@ -5,7 +5,7 @@ ZOPE_HOME="<<ZOPE_HOME>>"
 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"

--- a/skel/bin/zopectl.in
+++ b/skel/bin/zopectl.in
@@ -5,7 +5,7 @@ ZOPE_HOME="<<ZOPE_HOME>>"
 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"