From: Junghyun Kim Date: Mon, 9 Jan 2017 22:47:07 +0000 (+0900) Subject: BUGFIXED: source functions.sh in same-build-result.sh X-Git-Tag: submit/tizen_7.0_base/20221028.200901 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Fsubmit%2Ftizen_7.0_base%2F20221028.200901;p=platform%2Fupstream%2Fbuild-compare.git BUGFIXED: source functions.sh in same-build-result.sh This is required to check whether the project is prerelease/trbs project or not. Change-Id: Ib90c9598d72d6dc713d0a49e6d6f1f26d501a92f Signed-off-by: Junghyun Kim --- diff --git a/packaging/same-build-result.sh b/packaging/same-build-result.sh index 2e879e4..701ccf2 100644 --- a/packaging/same-build-result.sh +++ b/packaging/same-build-result.sh @@ -13,6 +13,7 @@ CMPSCRIPT=${0%/*}/pkg-diff.sh SCMPSCRIPT=${0%/*}/srpm-check.sh +FUNCTIONS=${0%/*}/functions.sh check_all=1 OLDDIR="$1" @@ -30,6 +31,8 @@ if [ -z "$NEWDIRS" ]; then exit 1 fi +source $FUNCTIONS + first_rpm=$(find $NEWDIRS -name *.rpm | head -1) dist=$(rpm -qp --nodigest --nosignature --qf "%{DISTRIBUTION}" $first_rpm | sed -r 's/(.*)\/.*/\1/') prerelease=0 @@ -41,7 +44,7 @@ if ! is_prerelease_project $dist; then num_old_pkgs=`find $OLDDIR -name '*.rpm' -and ! -name '*.delta.rpm' -and ! -name '*.src.rpm' | wc -l` if test $num_new_pkgs != $num_old_pkgs; then echo "different number of subpackages" - find $OLDDIR $NEWDIRS -name '*.rpm' -and ! -name '*.delta.rpm' + find $OLDDIR $NEWDIRS -name '*.rpm' -and ! -name '*.delta.rpm' -and ! -name '*.src.rpm' exit 1 fi