diff --git a/build-compare.changes b/build-compare.changes index 878a991..70954b3 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Jul 27 10:36:49 CEST 2009 - aj@suse.de + +- Fail rpm-check if unrpm does not exist (noticed with package + build). + +------------------------------------------------------------------- +Sun Jul 26 21:06:06 CEST 2009 - aj@suse.de + +- Fix problem found with building gettext-tools: tar packages + directories. + ------------------------------------------------------------------- Thu Jul 23 15:30:30 CEST 2009 - aj@suse.de diff --git a/build-compare.spec b/build-compare.spec index 7a44fe8..8af4c00 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -1,5 +1,5 @@ # -# spec file for package build-compare (Version 2009.07.23) +# spec file for package build-compare (Version 2009.07.27) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ License: GPL v2 or later Group: Development/Tools/Building AutoReqProv: on Summary: Build Result Compare Script -Version: 2009.07.23 +Version: 2009.07.27 Release: 1 Source: same-build-result.sh Source1: rpm-check.sh diff --git a/rpm-check.sh b/rpm-check.sh index 07f694c..523471d 100644 --- a/rpm-check.sh +++ b/rpm-check.sh @@ -8,6 +8,11 @@ RPM="rpm -qp --nodigest --nosignature" +if [ ! -e /usr/bin/unrpm ] ; then + echo "unrpm is not installed - comparison not possible" + exit 1 +fi + check_all= case $1 in -a | --check-all) @@ -266,7 +271,8 @@ check_single_file() fi fi done - return $ret;; + return $ret + ;; *.zip|*.jar) cd old unjar_l ./$file > flist @@ -409,6 +415,10 @@ check_single_file() return 1 fi ;; + *directory) + # tar might package directories - ignore them here + return 0 + ;; *) if ! diff_two_files; then return 1