[Jython-checkins] jython (merge 2.5 -> default): merge w/2.5: #2017: jython.bat script pollutes environment! (variables)

[alan.kennedy]

http://hg.python.org/jython/rev/67fea7719593
changeset:   7066:67fea7719593
parent:      7064:ae103c4e1aef
parent:      7065:5ce837b1a1d8
user:        Alan Kennedy <alan at xhaus.com>
date:        Tue Feb 26 09:23:35 2013 +0000
summary:
  merge w/2.5: #2017: jython.bat script pollutes environment! (variables)

files:
  NEWS                                                                 |  1 +
  installer/src/java/org/python/util/install/StartScriptGenerator.java |  4 ++++
  2 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -41,6 +41,7 @@
 
 Jython 2.5.4rc2
   Bugs Fixed
+    - [ 2017 ] jython.bat script pollutes environment! (variables)
     - [ 1899 ] Fix to platform.py to correctly avoid a warning message on Windows.
     - [ 1988 ] API for threading.condition fails to accept *args for acquire
     - [ 1753 ] zlib doesn't call end() on compress and decompress
diff --git a/installer/src/java/org/python/util/install/StartScriptGenerator.java b/installer/src/java/org/python/util/install/StartScriptGenerator.java
--- a/installer/src/java/org/python/util/install/StartScriptGenerator.java
+++ b/installer/src/java/org/python/util/install/StartScriptGenerator.java
@@ -158,6 +158,10 @@
         StringBuilder builder = new StringBuilder(1000);
         builder.append("@echo off");
         builder.append(WIN_CR_LF);
+        builder.append("rem Prevent leak of environment variables");
+        builder.append(WIN_CR_LF);
+        builder.append("setlocal");
+        builder.append(WIN_CR_LF);
         builder.append("rem This file was generated by the Jython installer");
         builder.append(WIN_CR_LF);
         builder.append("rem Created on {0} by {1}");

-- 
Repository URL: http://hg.python.org/jython