[Zope3-checkins] SVN: Zope3/branches/3.3/ - Fixed "zopectl run" (issue 632 and removed the broken "import paths" statement")

[Christian Theune]

Log message for revision 68163:
   - Fixed "zopectl run" (issue 632 and removed the broken "import paths" statement")
  
  

Changed:
  U   Zope3/branches/3.3/doc/CHANGES.txt
  U   Zope3/branches/3.3/zopeskel/bin/scriptzope.bat.in
  U   Zope3/branches/3.3/zopeskel/bin/scriptzope.in

-=-
Modified: Zope3/branches/3.3/doc/CHANGES.txt
===================================================================
--- Zope3/branches/3.3/doc/CHANGES.txt	2006-05-17 08:27:40 UTC (rev 68162)
+++ Zope3/branches/3.3/doc/CHANGES.txt	2006-05-17 08:29:27 UTC (rev 68163)
@@ -15,6 +15,8 @@
 
       - Provide ZODB migration script for moved DublinCore classes.
 
+      - Fixed issue 632: "bin/zopectl run" drops into python shell on errors.
+
   Zope 3.3.0b1 (2006/05/08)
 
     New features

Modified: Zope3/branches/3.3/zopeskel/bin/scriptzope.bat.in
===================================================================
--- Zope3/branches/3.3/zopeskel/bin/scriptzope.bat.in	2006-05-17 08:27:40 UTC (rev 68162)
+++ Zope3/branches/3.3/zopeskel/bin/scriptzope.bat.in	2006-05-17 08:29:27 UTC (rev 68163)
@@ -1,4 +1,4 @@
 @echo off
 set PYTHON=<<PYTHON>>
 set INSTANCE_HOME=<<INSTANCE_HOME>>
-"%PYTHON%" -i "%INSTANCE_HOME%\bin\scriptzope" %1 %2 %3 %4 %5 %6 %7
+"%PYTHON%" "%INSTANCE_HOME%\bin\scriptzope" %1 %2 %3 %4 %5 %6 %7

Modified: Zope3/branches/3.3/zopeskel/bin/scriptzope.in
===================================================================
--- Zope3/branches/3.3/zopeskel/bin/scriptzope.in	2006-05-17 08:27:40 UTC (rev 68162)
+++ Zope3/branches/3.3/zopeskel/bin/scriptzope.in	2006-05-17 08:29:27 UTC (rev 68163)
@@ -1,4 +1,4 @@
-#!<<PYTHON>> -i
+#!<<PYTHON>> 
 ##############################################################################
 #
 # Copyright (c) 2004 Zope Corporation and Contributors.
@@ -19,14 +19,10 @@
 import os
 import sys
 
-import paths
-paths.addPackagePaths()
-
 SOFTWARE_HOME = r"<<SOFTWARE_HOME>>"
 INSTANCE_HOME = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 CONFIG_FILE = os.path.join(INSTANCE_HOME, "etc", "zope.conf")
 
-
 def startup():
     # This removes the script directory from sys.path, which we do
     # since there are no modules here.
@@ -53,4 +49,3 @@
 
     script = sys.argv[1]
     execfile(script)
-    sys.exit()