svn commit: r612646 - in /lucene/hadoop/nightly: hudsonBuildHadoopPatch.sh hudsonPatchQueueAdmin.sh

[ni...@apache.org]

Author: nigel
Date: Wed Jan 16 15:53:03 2008
New Revision: 612646

URL: http://svn.apache.org/viewvc?rev=612646&view=rev
Log:
allow currently running issue to be enqueued again

Modified:
    lucene/hadoop/nightly/hudsonBuildHadoopPatch.sh
    lucene/hadoop/nightly/hudsonPatchQueueAdmin.sh

Modified: lucene/hadoop/nightly/hudsonBuildHadoopPatch.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/nightly/hudsonBuildHadoopPatch.sh?rev=612646&r1=612645&r2=612646&view=diff
==============================================================================
--- lucene/hadoop/nightly/hudsonBuildHadoopPatch.sh (original)
+++ lucene/hadoop/nightly/hudsonBuildHadoopPatch.sh Wed Jan 16 15:53:03 2008
@@ -361,13 +361,8 @@
 ### Cleanup files
 cleanupAndExit () {
   local result=$1
-  if [ ! -z "$defect" ] ; then
-    if [ -e $baseDir/patches/$defect ] ; then
-      rm -rf $baseDir/patches/$defect
-    fi
-  fi
-  if [ -h $baseDir/patches/current ] ; then
-    rm -f $baseDir/patches/current
+  if [ -e $baseDir/patches/current ] ; then
+    rm -rf $baseDir/patches/current
   fi
   echo ""
   echo ""

Modified: lucene/hadoop/nightly/hudsonPatchQueueAdmin.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/nightly/hudsonPatchQueueAdmin.sh?rev=612646&r1=612645&r2=612646&view=diff
==============================================================================
--- lucene/hadoop/nightly/hudsonPatchQueueAdmin.sh (original)
+++ lucene/hadoop/nightly/hudsonPatchQueueAdmin.sh Wed Jan 16 15:53:03 2008
@@ -3,29 +3,29 @@
 #set -x
 
 LOG=HadoopPatchQueue.txt
-CURRENT_LINK=../patches/current
+CURRENT_DIR=../patches/current
 START_PWD=`pwd`
 
-CURRENT_PATCH=`cat $CURRENT_LINK/defectNum`
+CURRENT_PATCH=`cat $CURRENT_DIR/defectNum`
 if [[ $CURRENT_PATCH == "" ]] ; then
   cd ../patches
-  CURRENT_PATCH=`ls -1dt HADOOP* | tail -1`
-  cd $START_PWD
+  CURRENT_PATCH=`ls -1dtr HADOOP* | head -1`
   if [[ $CURRENT_PATCH != "" ]] ; then
-    rm $CURRENT_LINK
-    ln -s $CURRENT_PATCH $CURRENT_LINK
+    rm -rf $CURRENT_DIR
+    mv $CURRENT_PATCH $CURRENT_DIR
     ### Start build.  The 'token' is a secret.
     echo "$CURRENT_PATCH patch submitted for testing at `date`"
     token=`cat ~hudson/private/hudsonBuildToken`
-    /usr/sfw/bin/wget -q -O $CURRENT_LINK/build http://lucene.zones.apache.org:8080/hudson/job/Hadoop-Patch/build?token=$token
-    chmod -R g+w $CURRENT_LINK
+    /usr/sfw/bin/wget -q -O $CURRENT_DIR/build http://lucene.zones.apache.org:8080/hudson/job/Hadoop-Patch/build?token=$token
+    chmod -R g+w $CURRENT_DIR
   else
     CURRENT_PATCH="<none>"
   fi
+  cd $START_PWD
 fi
 
 cd ../patches
-QUEUE=`ls -1dtr HADOOP* | sed -e "s|$CURRENT_PATCH\n||"`
+QUEUE=`ls -1dtr HADOOP*`
 cd $START_PWD
 if [[ $QUEUE == "" ]] ; then
   QUEUE="<empty>"