Author: bodewig
Date: Tue Sep 21 12:07:29 2010
New Revision: 999368
URL: http://svn.apache.org/viewvc?rev=999368&view=rev
Log:
don't swallow first arg if CLASSPATH isn't set. PR 49963. Submitted by Devon
C. Miller
Modified:
ant/core/trunk/CONTRIBUTORS
ant/core/trunk/WHATSNEW
ant/core/trunk/contributors.xml
ant/core/trunk/src/script/runant.py
Modified: ant/core/trunk/CONTRIBUTORS
URL:
http://svn.apache.org/viewvc/ant/core/trunk/CONTRIBUTORS?rev=999368&r1=999367&r2=999368&view=diff
==============================================================================
--- ant/core/trunk/CONTRIBUTORS (original)
+++ ant/core/trunk/CONTRIBUTORS Tue Sep 21 12:07:29 2010
@@ -87,6 +87,7 @@ David Maclean
David Rees
Denis Hennessy
Derek Slager
+Devon C. Miller
Diane Holt
dIon Gillard
Dmitry A. Kuminov
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=999368&r1=999367&r2=999368&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Sep 21 12:07:29 2010
@@ -150,6 +150,9 @@ Fixed bugs:
argument, even though the javadoc says, null is a valid value.
Bugzilla Report 49803.
+ * runant.py would swallow the first argument if CLASSPATH wasn't set.
+ Bugzilla Report 49963.
+
Other changes:
--------------
Modified: ant/core/trunk/contributors.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/contributors.xml?rev=999368&r1=999367&r2=999368&view=diff
==============================================================================
--- ant/core/trunk/contributors.xml (original)
+++ ant/core/trunk/contributors.xml Tue Sep 21 12:07:29 2010
@@ -374,6 +374,11 @@
<last>Slager</last>
</name>
<name>
+ <first>Devon</first>
+ <middle>C.</middle>
+ <last>Miller</last>
+ </name>
+ <name>
<first>Diane</first>
<last>Holt</last>
</name>
Modified: ant/core/trunk/src/script/runant.py
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/script/runant.py?rev=999368&r1=999367&r2=999368&view=diff
==============================================================================
--- ant/core/trunk/src/script/runant.py (original)
+++ ant/core/trunk/src/script/runant.py Tue Sep 21 12:07:29 2010
@@ -86,11 +86,11 @@ if os.environ.has_key('ANT_ARGS'):
CLASSPATH = ""
if os.environ.has_key('CLASSPATH'):
- CLASSPATH = os.environ['CLASSPATH']
+ CLASSPATH = "-lib " + os.environ['CLASSPATH']
# Builds the commandline
cmdline = ('%s %s -classpath %s -Dant.home=%s %s ' + \
- 'org.apache.tools.ant.launch.Launcher %s -lib %s %s') \
+ 'org.apache.tools.ant.launch.Launcher %s %s %s') \
% (JAVACMD, ANT_OPTS, LOCALCLASSPATH, ANT_HOME, OPTS, ANT_ARGS, \
CLASSPATH, string.join(sys.argv[1:], ' '))
