diff options
| author | wanchao-xu <wanchao.xu@samsung.com> | 2024-05-10 11:29:32 +0800 |
|---|---|---|
| committer | wanchao-xu <wanchao.xu@samsung.com> | 2024-05-11 14:01:16 +0800 |
| commit | 52349a883ca10f0f8ea7a33fe4f8da6b01eb354f (patch) | |
| tree | e3d02b501dab192a71a8cf9cb81d0378807e1aed | |
| parent | 4dec7a517ca8ac27c143e4070f32f75bc08d64a8 (diff) | |
| download | build-compare-accepted/tizen_base.tar.gz build-compare-accepted/tizen_base.tar.bz2 build-compare-accepted/tizen_base.zip | |
Fix the distribution of rpm is not compared.accepted/tizen/base/x/20240520.013402accepted/tizen/base/20240517.023250tizen_baseaccepted/tizen_base_xaccepted/tizen_base
Change-Id: I136ac66f20cf110f2f0dd7c040601fbc954f0770
Signed-off-by: wanchao-xu <wanchao.xu@samsung.com>
| -rwxr-xr-x | packaging/functions.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/packaging/functions.sh b/packaging/functions.sh index bdbbbb4..4756240 100755 --- a/packaging/functions.sh +++ b/packaging/functions.sh @@ -341,12 +341,12 @@ function cmp_rpm_meta () dist=$(check_header "$QF" $newrpm | sed -r 's/(.*)\/.*/\1/') if ! is_prerelease_project $dist; then echo "This is a prerelease project. Do not compare the project name." - QF="\n___QF_DISTURL___\n%{DISTURL}\n___QF_DISTURL___\n" + QF="\n___QF_DISTURL_DISTRIBUTION___\n%{DISTURL}\n___QF_DISTURL_DISTRIBUTION___\n" echo `check_header "$QF" $oldrpm | sed -r 's/.*\/(.*\/.*)/\1/'` >> $rpm_meta_old echo `check_header "$QF" $newrpm | sed -r 's/.*\/(.*\/.*)/\1/'` >> $rpm_meta_new else - QF="\n___QF_DISTURL_DISTRIBUTION___\n%{DISTURL} %{DISTRIBUTION}\n___QF_DISTURL_DISTRIBUTION___\n" echo "This is not a prerelease project. Compare the project name." + QF="\n___QF_DISTURL_DISTRIBUTION___\n%{DISTURL} %{DISTRIBUTION}\n___QF_DISTURL_DISTRIBUTION___\n" check_header "$QF" $oldrpm >> $rpm_meta_old check_header "$QF" $newrpm >> $rpm_meta_new fi @@ -362,6 +362,13 @@ function cmp_rpm_meta () return 1 fi + get_value QF_DISTURL_DISTRIBUTION $rpm_meta_old > $file1 + get_value QF_DISTURL_DISTRIBUTION $rpm_meta_new > $file2 + if ! comp_file disturl_distribution $file1 $file2 $rpm_meta_old $rpm_meta_new; then + rm -rf "$tmpdir" + return 1 + fi + name_new="$(get_value QF_NAME $rpm_meta_new)" version_release_new="$(get_value QF_VER_REL $rpm_meta_new)" name_ver_rel_new="$(get_value QF_NAME_VER_REL $rpm_meta_new)" |