Repository: hadoop Updated Branches: refs/heads/trunk 44809b808 -> 4528eb9fb
HADOOP-11524. hadoop_do_classpath_subcommand throws a shellcheck warning. Contributed by Chris Nauroth. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4528eb9f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4528eb9f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4528eb9f Branch: refs/heads/trunk Commit: 4528eb9fb2e1a99c985926eacb3450b806ea6b4f Parents: 44809b8 Author: cnauroth <cnaur...@apache.org> Authored: Wed Mar 25 22:36:09 2015 -0700 Committer: cnauroth <cnaur...@apache.org> Committed: Wed Mar 25 22:36:09 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ hadoop-common-project/hadoop-common/src/main/bin/hadoop | 2 +- .../hadoop-common/src/main/bin/hadoop-functions.sh | 4 ++-- hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs | 2 +- hadoop-mapreduce-project/bin/mapred | 2 +- hadoop-yarn-project/hadoop-yarn/bin/yarn | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4528eb9f/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 2e26b0a..667a010 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -187,6 +187,9 @@ Trunk (Unreleased) HADOOP-10115. Exclude duplicate jars in hadoop package under different component's lib (Vinayakumar B via aw) + HADOOP-11524. hadoop_do_classpath_subcommand throws a shellcheck warning. + (cnauroth) + BUG FIXES HADOOP-11473. test-patch says "-1 overall" even when all checks are +1 http://git-wip-us.apache.org/repos/asf/hadoop/blob/4528eb9f/hadoop-common-project/hadoop-common/src/main/bin/hadoop ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop b/hadoop-common-project/hadoop-common/src/main/bin/hadoop index 6003927..64c3c13 100755 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop @@ -125,7 +125,7 @@ case ${COMMAND} in CLASS=org.apache.hadoop.util.NativeLibraryChecker ;; classpath) - hadoop_do_classpath_subcommand "$@" + hadoop_do_classpath_subcommand CLASS "$@" ;; credential) CLASS=org.apache.hadoop.security.alias.CredentialShell http://git-wip-us.apache.org/repos/asf/hadoop/blob/4528eb9f/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh index 8129c5c..616e706 100644 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh @@ -1305,8 +1305,8 @@ function hadoop_verify_user function hadoop_do_classpath_subcommand { - if [[ "$#" -gt 0 ]]; then - CLASS=org.apache.hadoop.util.Classpath + if [[ "$#" -gt 1 ]]; then + eval "$1"=org.apache.hadoop.util.Classpath else hadoop_finalize echo "${CLASSPATH}" http://git-wip-us.apache.org/repos/asf/hadoop/blob/4528eb9f/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs index ececbb4..f464261 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs @@ -94,7 +94,7 @@ case ${COMMAND} in CLASS=org.apache.hadoop.hdfs.tools.CacheAdmin ;; classpath) - hadoop_do_classpath_subcommand "$@" + hadoop_do_classpath_subcommand CLASS "$@" ;; crypto) CLASS=org.apache.hadoop.hdfs.tools.CryptoAdmin http://git-wip-us.apache.org/repos/asf/hadoop/blob/4528eb9f/hadoop-mapreduce-project/bin/mapred ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/bin/mapred b/hadoop-mapreduce-project/bin/mapred index d199128..5afe02e 100755 --- a/hadoop-mapreduce-project/bin/mapred +++ b/hadoop-mapreduce-project/bin/mapred @@ -78,7 +78,7 @@ case ${COMMAND} in HADOOP_OPTS="${HADOOP_OPTS} ${HADOOP_CLIENT_OPTS}" ;; classpath) - hadoop_do_classpath_subcommand "$@" + hadoop_do_classpath_subcommand CLASS "$@" ;; distcp) CLASS=org.apache.hadoop.tools.DistCp http://git-wip-us.apache.org/repos/asf/hadoop/blob/4528eb9f/hadoop-yarn-project/hadoop-yarn/bin/yarn ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn b/hadoop-yarn-project/hadoop-yarn/bin/yarn index e6af4ae..fddee46 100644 --- a/hadoop-yarn-project/hadoop-yarn/bin/yarn +++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn @@ -82,7 +82,7 @@ case "${COMMAND}" in set -- "${COMMAND}" "$@" ;; classpath) - hadoop_do_classpath_subcommand "$@" + hadoop_do_classpath_subcommand CLASS "$@" ;; cluster) CLASS=org.apache.hadoop.yarn.client.cli.ClusterCLI
