Mailing List Archive

Author: hege
Date: Sun Jul 26 11:09:59 2020
New Revision: 1880321

URL: http://svn.apache.org/viewvc?rev=1880321&view=rev
Log:
copy_update_paranoid function was missing??

Modified:
spamassassin/trunk/build/mkupdates/mkupdate-with-scores

Modified: spamassassin/trunk/build/mkupdates/mkupdate-with-scores
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkupdates/mkupdate-with-scores?rev=1880321&r1=1880320&r2=1880321&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/mkupdate-with-scores (original)
+++ spamassassin/trunk/build/mkupdates/mkupdate-with-scores Sun Jul 26 11:09:59 2020
@@ -169,13 +169,28 @@ make_rule_update_from_trunk() {
tar -ztvf $TMPDIR/${REVISION}.tar.gz
}

+copy_update_paranoid() {
+ SRC=$1
+ DST=$2
+
+ set +e
+ cp $SRC $DST
+ diff -u $SRC $DST
+ if [ $? -ne 0 ]; then
+ set -e
+ return 1
+ fi
+ set -e
+ return 0
+}
+
copy_existing_update_for_reversion_testing() {
EXIT=0
(
copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz" "$TMPDIR/$REVISION.tar.gz" &&
copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz.asc" "$TMPDIR/$REVISION.tar.gz.asc" &&
copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz.sha1" "$TMPDIR/$REVISION.tar.gz.sha1" &&
- copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz.sha256" "$TMPDIR/$REVISION.tar.gz.sha256"
+ copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz.sha256" "$TMPDIR/$REVISION.tar.gz.sha256" &&
copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz.sha512" "$TMPDIR/$REVISION.tar.gz.sha512"
) || EXIT=6