Attachment 712698 Details for Bug 922883 – Patch to loop through multiple results for the same filename in the eap zip

[patch] Patch to loop through multiple results for the same filename in the eap zip

0001-922883-Improve-handling-when-multiple-jars-in-the-EA.patch (text/plain), 2.83 KB, created by Paul Gier on 2013-03-19 14:11:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Gier

Created: 2013-03-19 14:11:17 UTC

Size: 2.83 KB

patch

obsolete

>From a4df7629f0b0bdd26cd2afd3be1f00581f0d0039 Mon Sep 17 00:00:00 2001
>From: Paul Gier <pgier@redhat.com>
>Date: Tue, 19 Mar 2013 09:07:41 -0500
>Subject: [PATCH] [922883] Improve handling when multiple jars in the EAP zip
> have the same name
>
>---
> compare-maven-repo/compare-repo-jars-with-EAP.sh |   42 ++++++++++-----------
> 1 files changed, 20 insertions(+), 22 deletions(-)
>
>diff --git a/compare-maven-repo/compare-repo-jars-with-EAP.sh b/compare-maven-repo/compare-repo-jars-with-EAP.sh
>index cdd26c9..894146b 100755
>--- a/compare-maven-repo/compare-repo-jars-with-EAP.sh
>+++ b/compare-maven-repo/compare-repo-jars-with-EAP.sh
>@@ -23,37 +23,35 @@ for PATH_IN_REPO in `find $REPO_DIR  -type f -name "*.jar"`; do
>   BASENAME=`basename $PATH_IN_REPO`
>   echo -----  $PATH_IN_REPO
> 
>-  if [[ $BASENAME == jboss-as-jsf-injection* ]]; then
>-    PATH_IN_EAP=`find $EAP_DIR -name $BASENAME | head -1`  ## BZ 922883 - jboss-as-jsf-injection duplicated
>-  else 
>-      PATH_IN_EAP=`find $EAP_DIR -name $BASENAME`
>-  fi
>+  PATHS_IN_EAP=`find $EAP_DIR -name $BASENAME`
>   RESULT_TEXT=""
>   RESULT_TEXT_ERR=""
>   RET=0
>-  if [ "$PATH_IN_EAP" == ""  ]; then
>+  if [ "$PATHS_IN_EAP" == ""  ]; then
>     RESULT_TEXT="Not present in EAP distro" 
>     COUNTER_NOT_PRESENT=$(($COUNTER_NOT_PRESENT+1))
>   else 
>     REPOFILE_SUM=`md5sum $PATH_IN_REPO  | cut -f1 -d' '`
>-    EAPFILE_SUM=`md5sum $PATH_IN_EAP | cut -f1 -d' '`
>-    if [ "$REPOFILE_SUM" != "$EAPFILE_SUM" ]; then
>-       COUNTER_FAIL=$(($COUNTER_FAIL+1))
>-       RESULT_TEXT="FAIL - md5sums are different"
>-       RESULT_TEXT_ERR="$REPOFILE_SUM -- $PATH_IN_REPO\n$EAPFILE_SUM -- $PATH_IN_EAP"
>+    for PATH_IN_EAP in $PATHS_IN_EAP ; do
>+      EAPFILE_SUM=`md5sum $PATH_IN_EAP | cut -f1 -d' '`
>+      if [ "$REPOFILE_SUM" != "$EAPFILE_SUM" ]; then
>+        COUNTER_FAIL=$(($COUNTER_FAIL+1))
>+        RESULT_TEXT="FAIL - md5sums are different"
>+        RESULT_TEXT_ERR="$REPOFILE_SUM -- $PATH_IN_REPO\n$EAPFILE_SUM -- $PATH_IN_EAP"
> 
>-       RESULT_TEXT_ERR="$RESULT_TEXT_ERR\ndiff-jars output:"
>-       diff-jars $PATH_IN_REPO $PATH_IN_EAP 2>&1 >diff-jars.out
>-       while read line; do    
>-         RESULT_TEXT_ERR="$RESULT_TEXT_ERR\n$line"
>-       done <diff-jars.out
>-       RESULT_TEXT_ERR="$RESULT_TEXT_ERR\n-----------------"
>+        RESULT_TEXT_ERR="$RESULT_TEXT_ERR\ndiff-jars output:"
>+        diff-jars $PATH_IN_REPO $PATH_IN_EAP 2>&1 >diff-jars.out
>+        while read line; do    
>+          RESULT_TEXT_ERR="$RESULT_TEXT_ERR\n$line"
>+        done <diff-jars.out
>+        RESULT_TEXT_ERR="$RESULT_TEXT_ERR\n-----------------"
> 
>-       RET=1
>-    else
>-       COUNTER_OK=$(($COUNTER_OK+1))
>-       RESULT_TEXT="OK - files have the same md5sum" 
>-    fi
>+        RET=1
>+      else
>+        COUNTER_OK=$(($COUNTER_OK+1))
>+        RESULT_TEXT="OK - files have the same md5sum" 
>+      fi
>+    done
>   fi
> 
>   printResultInfo
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 922883: 712698