diff --git a/kiwi_label_helper b/kiwi_label_helper index 12055a5..86c89f9 100644 --- a/kiwi_label_helper +++ b/kiwi_label_helper @@ -9,6 +9,9 @@ fi BUILD_DATA="${BUILD_DIST/.dist/.data}" . "${BUILD_DATA}" +# The build script renames the recipe (to strip _service:foo:), but doesn't update .data +RECIPEFILE="${RECIPEFILE##*:}" + if [ "${RECIPEFILE##*.}" != "kiwi" ]; then echo "Recipe is not a kiwi file - exiting" exit 0 diff --git a/obs-service-kiwi_label_helper.changes b/obs-service-kiwi_label_helper.changes index 4708c61..6ff7653 100644 --- a/obs-service-kiwi_label_helper.changes +++ b/obs-service-kiwi_label_helper.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 4 13:42:18 UTC 2020 - Fabian Vogt + +- Strip service prefix from the recipe name to work with enabled + services in OBS + ------------------------------------------------------------------- Thu Jan 10 08:22:53 UTC 2019 - Fabian Vogt diff --git a/obs-service-kiwi_label_helper.spec b/obs-service-kiwi_label_helper.spec index a367a71..7292170 100644 --- a/obs-service-kiwi_label_helper.spec +++ b/obs-service-kiwi_label_helper.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-kiwi_label_helper # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,7 +22,7 @@ Release: 0 Summary: Service to duplicate labels with a custom prefix License: GPL-2.0-or-later Group: Development/Tools/Building -Url: https://build.opensuse.org +URL: https://build.opensuse.org Source0: kiwi_label_helper.service Source1: kiwi_label_helper Source2: README