svn commit: r1227260 - in /hadoop/common/branches/HDFS-1623: ./ hadoop-dist/pom.xml

[atm]

Author: atm
Date: Wed Jan  4 18:47:51 2012
New Revision: 1227260

URL: http://svn.apache.org/viewvc?rev=1227260&view=rev
Log:
Merge trunk into HA branch.

Modified:
    hadoop/common/branches/HDFS-1623/   (props changed)
    hadoop/common/branches/HDFS-1623/hadoop-dist/pom.xml

Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 18:47:51 2012
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1226898
+/hadoop/common/trunk:1152502-1227258

Modified: hadoop/common/branches/HDFS-1623/hadoop-dist/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-dist/pom.xml?rev=1227260&r1=1227259&r2=1227260&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-dist/pom.xml Wed Jan  4 18:47:51 
2012
@@ -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
                       }