浏览代码

Merge -r 1227224:1227225 from trunk to branch. FIXES: HADOOP-7948

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227234 13f79535-47bb-0310-9956-ffa450edef68
Alejandro Abdelnur 13 年之前
父节点
当前提交
19f69fa577
共有 2 个文件被更改,包括 9 次插入4 次删除
  1. 3 0
      hadoop-common-project/hadoop-common/CHANGES.txt
  2. 6 4
      hadoop-dist/pom.xml

+ 3 - 0
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -105,6 +105,9 @@ Release 0.23.1 - Unreleased
 
    HADOOP-7837. no NullAppender in the log4j config. (eli)
 
+   HADOOP-7948. Shell scripts created by hadoop-dist/pom.xml to build tar do not 
+   properly propagate failure. (cim_michajlomatijkiw via tucu)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES

+ 6 - 4
hadoop-dist/pom.xml

@@ -98,11 +98,12 @@
                       run() {
                         echo "\$ ${@}"
                         "${@}"
-                        if [ $? != 0 ]; then
+                        res=$?
+                        if [ $res != 0 ]; then
                           echo
                           echo "Failed!"
                           echo
-                          exit $?
+                          exit $res
                         fi
                       }
 
@@ -139,11 +140,12 @@
                       run() {
                         echo "\$ ${@}"
                         "${@}"
-                        if [ $? != 0 ]; then
+                        res=$?
+                        if [ $res != 0 ]; then
                           echo
                           echo "Failed!"
                           echo
-                          exit $?
+                          exit $res
                         fi
                       }