svn commit: r1376196 - /incubator/oozie/trunk/bin/test-patch

[tu...@apache.org]

Author: tucu
Date: Wed Aug 22 18:57:28 2012
New Revision: 1376196

URL: http://svn.apache.org/viewvc?rev=1376196&view=rev
Log:
Improvements to test-patch script (tucu)

Modified:
    incubator/oozie/trunk/bin/test-patch

Modified: incubator/oozie/trunk/bin/test-patch
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/bin/test-patch?rev=1376196&r1=1376195&r2=1376196&view=diff
==============================================================================
--- incubator/oozie/trunk/bin/test-patch (original)
+++ incubator/oozie/trunk/bin/test-patch Wed Aug 22 18:57:28 2012
@@ -28,7 +28,6 @@ JIRAURL="${JIRAHOST}/jira"
 JIRAURLISSUEPREFIX="${JIRAURL}/browse/"
 
 JIRAUPDATE="false"
-JIRACLI=""
 JIRAUSER="oozieqa"
 JIRAPASSWORD=""
 
@@ -105,7 +104,7 @@ prepareTestPatchDirs() {
 ###############################################################################
 updateJira() {
   if [[ "${JIRAUPDATE}" != "" && "${JIRAISSUE}" != "" ]] ; then
-    if [[ "$JIRACLI" != "" && "$JIRAPASSWORD" != "" ]] ; then
+    if [[ "$JIRAPASSWORD" != "" ]] ; then
       JIRACLI=${TOOLSDIR}/jira-cli/jira.sh
       if [ ! -e "${JIRACLI}" ] ; then
         curl https://bobswift.atlassian.net/wiki/download/attachments/16285777/jira-cli-2.6.0-distribution.zip > ${TEMPDIR}/jira-cli.zip
@@ -273,6 +272,12 @@ applyPatch() {
         >> $STDOUT
   if [[  ${PIPESTATUS[0]} != 0 ]] ; then
     echo "Patch failed to apply to head of branch"
+    echo "Patch failed to apply to head of branch" >> ${SUMMARYFILE}
+    echo "" >> ${SUMMARYFILE}
+    echo "----------------------------" >> ${SUMMARYFILE}
+    if [ "${JIRAUPDATE}" == "true" ] ; then
+      echo "{code}" >> ${SUMMARYFILE}
+    fi
     echo
     cleanupAndExit 1
   fi