3
0
forked from pool/build-compare
OBS User unknown 2009-08-04 22:33:08 +00:00 committed by Git OBS Bridge
parent 2776b66d87
commit 74b6ce4000
3 changed files with 20 additions and 6 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Aug 4 08:05:22 CEST 2009 - aj@suse.de
- Compare mono files with cmp, just in case (handles rfc).
-------------------------------------------------------------------
Sun Aug 2 07:15:45 CEST 2009 - aj@suse.de
- Sort jar filelists before compare.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 27 10:36:49 CEST 2009 - aj@suse.de Mon Jul 27 10:36:49 CEST 2009 - aj@suse.de

View File

@ -1,5 +1,5 @@
# #
# spec file for package build-compare (Version 2009.07.27) # spec file for package build-compare (Version 2009.08.04)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -23,7 +23,7 @@ License: GPL v2 or later
Group: Development/Tools/Building Group: Development/Tools/Building
AutoReqProv: on AutoReqProv: on
Summary: Build Result Compare Script Summary: Build Result Compare Script
Version: 2009.07.27 Version: 2009.08.04
Release: 1 Release: 1
Source: same-build-result.sh Source: same-build-result.sh
Source1: rpm-check.sh Source1: rpm-check.sh

View File

@ -234,8 +234,12 @@ check_single_file()
;; ;;
*.dll|*.exe) *.dll|*.exe)
# we can't handle it well enough # we can't handle it well enough
echo "mono files unhandled ($file)" if ! cmp -s old/$file new/$file; then
return 1;; echo "mono $file differs"
return 1
fi
return 0
;;
*.a) *.a)
echo "$file is .a" echo "$file is .a"
flist=`ar t new/$file` flist=`ar t new/$file`
@ -275,10 +279,10 @@ check_single_file()
;; ;;
*.zip|*.jar) *.zip|*.jar)
cd old cd old
unjar_l ./$file > flist unjar_l ./$file |sort > flist
sed -i -e "s, [0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] , date ," flist sed -i -e "s, [0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] , date ," flist
cd ../new cd ../new
unjar_l ./$file > flist unjar_l ./$file |sort> flist
sed -i -e "s, [0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] , date ,; " flist sed -i -e "s, [0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9] , date ,; " flist
cd .. cd ..
if ! cmp -s old/flist new/flist; then if ! cmp -s old/flist new/flist; then