Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package obs-service-kiwi_metainfo_helper for
openSUSE:Factory checked in at 2022-03-18 16:41:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-kiwi_metainfo_helper (Old)
and
/work/SRC/openSUSE:Factory/.obs-service-kiwi_metainfo_helper.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-kiwi_metainfo_helper"
Fri Mar 18 16:41:23 2022 rev:13 rq:962100 version:0.6
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-kiwi_metainfo_helper/obs-service-kiwi_metainfo_helper.changes
2022-02-10 23:12:17.944242193 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-kiwi_metainfo_helper.new.25692/obs-service-kiwi_metainfo_helper.changes
2022-03-18 16:41:25.913151074 +0100
@@ -1,0 +2,8 @@
+Tue Feb 15 11:03:50 UTC 2022 - Frederic Crozat <[email protected]>
+
+- Generate OS_VERSION_NO_DASH based on os-release VERSION,
+ as workaround to replace dash with space in OS name
+ (bsc#1195061).
+- Bump version to 0.6
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-kiwi_metainfo_helper.spec ++++++
--- /var/tmp/diff_new_pack.n3s8Lq/_old 2022-03-18 16:41:26.389151415 +0100
+++ /var/tmp/diff_new_pack.n3s8Lq/_new 2022-03-18 16:41:26.397151421 +0100
@@ -17,7 +17,7 @@
Name: obs-service-kiwi_metainfo_helper
-Version: 0.5
+Version: 0.6
Release: 0
Summary: Service for substituting various variables in build recipes
License: GPL-2.0-or-later
++++++ README ++++++
--- /var/tmp/diff_new_pack.n3s8Lq/_old 2022-03-18 16:41:26.449151458 +0100
+++ /var/tmp/diff_new_pack.n3s8Lq/_new 2022-03-18 16:41:26.453151461 +0100
@@ -5,19 +5,20 @@
build recipe (.kiwi, Dockerfile, Chart.yaml) to replace placeholders with
build-specific metainfo.
-| Placeholder | Value
| Example
|
-|--------------------------------------|-----------------------------------------------
|-------------------------------------------------------------------------------------------------------------------------|
-| %DISTURL% | The OBS dist url
|
obs://build.opensuse.org/openSUSE:Factory/images/0f40c57dd619e1dff9e512949b6bca09-opensuse-tumbleweed-image
|
-| %SOURCEURL% | Source url for container recipe (OBS)
|
https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-tumbleweed-image?rev=0f40c57dd619e1dff9e512949b6bca09
|
-| %SOURCEURL% | Source url for container recipe (IBS)
|
https://sources.suse.com/SUSE:SLE-15:Update:CR/sles15-image/2951b67133dd6384cacb28203174e030/
|
-| %RELEASE% | The OBS release number
(<cicnt\>.<bldcnt\>) | 4.2
|
-| %BUILDTIME% | $(date --utc +%FT%T.%NZ)
| 2018-10-30T09:19:02.074934628Z
|
-| %OS_VERSION% | VERSION in the os-release file
| 15-SP3
|
-| %OS_VERSION_ID% | VERSION_ID in the os-release file
| 15
|
-| %OS_VERSION_ID_SP% | Like VERSION_ID, but with SP (SLE
only) | 15.3
|
-| %OS_PRETTY_NAME% | PRETTY_NAME in the os-release file
| SUSE Linux Enterprise Server 15 SP3 (Snapshot16)
|
-| %OS_VENDOR% | PRETTY_NAME up to first space
character | SUSE
|
-| %OS_PRETTY_NAME_DASHED% | PRETTY_NAME with dashes in place of
spaces | SUSE-Linux-Enterprise-Server-15-SP3-Snapshot-16
|
-| %OS_PRETTY_NAME_BEFORE_PAREN% | PRETTY_NAME up to the first open
parentheses | SUSE Linux Enterprise Server 15 SP3
|
-| %OS_PRETTY_NAME_BEFORE_PAREN_DASHED% | PRETTY_NAME up to first open paren
with dashes | SUSE-Linux-Enterprise-Server-15-SP3
|
+| Placeholder | Value
| Example
|
+|--------------------------------------|-------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------|
+| %DISTURL% | The OBS dist url
|
obs://build.opensuse.org/openSUSE:Factory/images/0f40c57dd619e1dff9e512949b6bca09-opensuse-tumbleweed-image
|
+| %SOURCEURL% | Source url for container recipe (OBS)
|
https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-tumbleweed-image?rev=0f40c57dd619e1dff9e512949b6bca09
|
+| %SOURCEURL% | Source url for container recipe (IBS)
|
https://sources.suse.com/SUSE:SLE-15:Update:CR/sles15-image/2951b67133dd6384cacb28203174e030/
|
+| %RELEASE% | The OBS release number
(<cicnt\>.<bldcnt\>) | 4.2
|
+| %BUILDTIME% | $(date --utc +%FT%T.%NZ)
| 2018-10-30T09:19:02.074934628Z
|
+| %OS_VERSION% | VERSION in the os-release file
| 15-SP3
|
+| %OS_VERSION_NO_DASH% | VERSION in the os-release file, with
space (SLE only) | 15 SP3
|
+| %OS_VERSION_ID% | VERSION_ID in the os-release file
| 15
|
+| %OS_VERSION_ID_SP% | Like VERSION_ID, but with SP (SLE
only) | 15.3
|
+| %OS_PRETTY_NAME% | PRETTY_NAME in the os-release file
| SUSE Linux Enterprise Server 15 SP3 (Snapshot16)
|
+| %OS_VENDOR% | PRETTY_NAME up to first space
character | SUSE
|
+| %OS_PRETTY_NAME_DASHED% | PRETTY_NAME with dashes in place of
spaces | SUSE-Linux-Enterprise-Server-15-SP3-Snapshot-16
|
+| %OS_PRETTY_NAME_BEFORE_PAREN% | PRETTY_NAME up to the first open
parentheses | SUSE Linux Enterprise Server 15 SP3
|
+| %OS_PRETTY_NAME_BEFORE_PAREN_DASHED% | PRETTY_NAME up to first open paren
with dashes | SUSE-Linux-Enterprise-Server-15-SP3
|
++++++ kiwi_metainfo_helper ++++++
--- /var/tmp/diff_new_pack.n3s8Lq/_old 2022-03-18 16:41:26.477151478 +0100
+++ /var/tmp/diff_new_pack.n3s8Lq/_new 2022-03-18 16:41:26.481151481 +0100
@@ -78,6 +78,7 @@
[ -f "${tempdir}/etc/os-release" ] && . "${tempdir}/etc/os-release"
VERSION="${VERSION:-}"
+ VERSION_NO_DASH="${VERSION/-/ }"
# Special case for SLE X "SP 0", make sure it has .0
VERSION_ID_SP="${VERSION_ID}"
[[ "${VERSION_ID_SP%}" == *"."* ]] || VERSION_ID_SP="${VERSION_ID}.0"
@@ -120,6 +121,7 @@
-e "s/%OS_PRETTY_NAME_BEFORE_PAREN%/${PRETTY_NAME_BEFORE_PAREN}/g" \
-e
"s/%OS_PRETTY_NAME_BEFORE_PAREN_DASHED%/${PRETTY_NAME_BEFORE_PAREN_DASHED}/g" \
-e "s/%OS_VERSION%/${VERSION}/g" \
+ -e "s/%OS_VERSION_NO_DASH%/${VERSION_NO_DASH}/g" \
-e "s/%OS_VERSION_ID_SP%/${VERSION_ID_SP}/g" "${files[@]}"
fi
++++++ test.sh ++++++
--- /var/tmp/diff_new_pack.n3s8Lq/_old 2022-03-18 16:41:26.521151509 +0100
+++ /var/tmp/diff_new_pack.n3s8Lq/_new 2022-03-18 16:41:26.525151512 +0100
@@ -34,6 +34,7 @@
RELEASE=%RELEASE%
BUILDTIME=%BUILDTIME%
OS_VERSION=%OS_VERSION%
+OS_VERSION_NO_DASH=%OS_VERSION_NO_DASH%
OS_VERSION_ID=%OS_VERSION_ID%
OS_VERSION_ID_SP=%OS_VERSION_ID_SP%
OS_PRETTY_NAME=%OS_PRETTY_NAME%
@@ -51,6 +52,7 @@
RELEASE=4.2
BUILDTIME=2018-10-30T09:19:02.074934628Z
OS_VERSION=15-SP4
+OS_VERSION_NO_DASH=15 SP4
OS_VERSION_ID=15.4
OS_VERSION_ID_SP=15.4
OS_PRETTY_NAME=SUSE Linux Enterprise Server 15 SP4
