don't swallow first arg if CLASSPATH isn't set. PR 49963. Submitted by Devon C. Miller

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@999368 13f79535-47bb-0310-9956-ffa450edef68

CONTRIBUTORS

@@ -87,6 +87,7 @@ David Maclean
 David Rees
 Denis Hennessy
 Derek Slager
+Devon C. Miller
 Diane Holt
 dIon Gillard
 Dmitry A. Kuminov

WHATSNEW

@@ -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:
 --------------
 

contributors.xml

@@ -373,6 +373,11 @@
     <first>Derek</first>
     <last>Slager</last>
   </name>
+  <name>
+    <first>Devon</first>
+    <middle>C.</middle>
+    <last>Miller</last>
+  </name>
   <name>
     <first>Diane</first>
     <last>Holt</last>

src/script/runant.py

@@ -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:], ' '))