Accepting request 1222063 from openSUSE:Tools
OBS-URL: https://build.opensuse.org/request/show/1222063 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-kiwi_metainfo_helper?expand=0&rev=19
This commit is contained in:
commit
82c2580838
@ -132,11 +132,14 @@ fi
|
|||||||
if [ -f containers/annotation ]; then
|
if [ -f containers/annotation ]; then
|
||||||
REGISTRY_REFNAME="$(sed -n 's/.*<registry_refname>\([^<]*\)<.*/\1/p' < containers/annotation)"
|
REGISTRY_REFNAME="$(sed -n 's/.*<registry_refname>\([^<]*\)<.*/\1/p' < containers/annotation)"
|
||||||
REGISTRY_DIGEST="$(sed -n 's/.*<registry_digest>\(.*\)<.*/\1/p' < containers/annotation)"
|
REGISTRY_DIGEST="$(sed -n 's/.*<registry_digest>\(.*\)<.*/\1/p' < containers/annotation)"
|
||||||
|
|
||||||
|
if [ -n "$REGISTRY_DIGEST" ]; then
|
||||||
sed -i"" \
|
sed -i"" \
|
||||||
-e "s#%BASE_REFNAME%#${REGISTRY_REFNAME}#g" \
|
-e "s#%BASE_REFNAME%#${REGISTRY_REFNAME}#g" \
|
||||||
-e "s#%BASE_DIGEST%#${REGISTRY_DIGEST}#g" \
|
-e "s#%BASE_DIGEST%#${REGISTRY_DIGEST}#g" \
|
||||||
"${files[@]}"
|
"${files[@]}"
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
sed -i"" \
|
sed -i"" \
|
||||||
-e "s#%DISTURL%#${DISTURL}#g" \
|
-e "s#%DISTURL%#${DISTURL}#g" \
|
||||||
|
@ -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>
|
Wed Sep 25 09:01:19 UTC 2024 - Fabian Vogt <fvogt@suse.com>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user