浏览代码

HADOOP-1114. Respect user's classpath variable in hadoop script. Contributed by Michael Bieniosek.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@527057 13f79535-47bb-0310-9956-ffa450edef68
Thomas White 18 年之前
父节点
当前提交
fca17e75d8
共有 2 个文件被更改,包括 5 次插入1 次删除
  1. 3 0
      CHANGES.txt
  2. 2 1
      bin/hadoop

+ 3 - 0
CHANGES.txt

@@ -137,6 +137,9 @@ Trunk (unreleased changes)
 42. HADOOP-1219.  Ignore progress report once a task has reported as 
     'done'.  (Devaraj Das via tomwhite)
 
+43. HADOOP-1114.  Respect user's classpath variable in hadoop script.  
+    (Michael Bieniosek via tomwhite)
+
 
 Release 0.12.3 - 2007-04-06
 

+ 2 - 1
bin/hadoop

@@ -79,7 +79,8 @@ if [ "$HADOOP_HEAPSIZE" != "" ]; then
 fi
 
 # CLASSPATH initially contains $HADOOP_CONF_DIR
-CLASSPATH="${HADOOP_CONF_DIR}"
+# respect previously set CLASSPATH
+CLASSPATH="${CLASSPATH}:${HADOOP_CONF_DIR}"
 CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/tools.jar
 
 # for developers, add Hadoop classes to CLASSPATH