- don't replace %BASE_DIGEST% with empty string when not available

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-kiwi_metainfo_helper?expand=0&rev=43
This commit is contained in:
Fabian Vogt 2024-11-07 09:27:14 +00:00 committed by Git OBS Bridge
parent 351e333731
commit 61fba753b8
2 changed files with 12 additions and 4 deletions

View File

@ -132,10 +132,13 @@ fi
if [ -f containers/annotation ]; then
REGISTRY_REFNAME="$(sed -n 's/.*<registry_refname>\([^<]*\)<.*/\1/p' < containers/annotation)"
REGISTRY_DIGEST="$(sed -n 's/.*<registry_digest>\(.*\)<.*/\1/p' < containers/annotation)"
sed -i"" \
-e "s#%BASE_REFNAME%#${REGISTRY_REFNAME}#g" \
-e "s#%BASE_DIGEST%#${REGISTRY_DIGEST}#g" \
"${files[@]}"
if [ -n "$REGISTRY_DIGEST" ]; then
sed -i"" \
-e "s#%BASE_REFNAME%#${REGISTRY_REFNAME}#g" \
-e "s#%BASE_DIGEST%#${REGISTRY_DIGEST}#g" \
"${files[@]}"
fi
fi
sed -i"" \

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Sep 30 14:13:12 UTC 2024 - Dirk Müller <dmueller@suse.com>
- don't replace %BASE_DIGEST% with empty string when not available
-------------------------------------------------------------------
Wed Sep 25 09:01:19 UTC 2024 - Fabian Vogt <fvogt@suse.com>