From bb880678c1cd120b5a208062f47e5c76b899ebe0 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Mon, 1 Mar 2021 12:04:36 +0100 Subject: [PATCH] OBS: latest: run osmo_obs_add_rpm_spec every time Replace the current logic, that would only run osmo_obs_add_rpm_spec when adding a new package, or when the version of a package has changed, with running it every time. Running the command when it is not needed does not hurt, as it does not take significant time, and osc does not attempt to upload the file when it did not change. The advantage is, that we can update/upload the spec file without tagging a new version, if a bug prevented it from getting uploaded before (as it just was the case for all Osmocom packages). Related: OS#5054 Change-Id: Ie067c97b5f54ec5b3309ddbd2bfb7f846cd0ccd3 --- scripts/osmocom-latest-packages.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index 9bf08eb4..fddcf0c3 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -96,7 +96,6 @@ build() { mv "$output/"*.tar* "$TOP/$PROJ/$project/" cd "$TOP/$PROJ" osc add "$project" - osmo_obs_add_rpm_spec "$TOP/$PROJ/$project" "$TOP/$project" "$project" "osmocom-latest" else cd "$TOP/$PROJ/$project" @@ -107,9 +106,11 @@ build() { mv "$output/"*.dsc . mv "$output/"*.tar* . osc add ./* - osmo_obs_add_rpm_spec "$PWD" "$TOP/$project" "$project" "osmocom-latest" fi fi + + osmo_obs_add_rpm_spec "$TOP/$PROJ/$project" "$TOP/$project" "$project" "osmocom-latest" + cd "$TOP" }