From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7F78D158020 for ; Sun, 11 Dec 2022 21:24:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 012B4E08BD; Sun, 11 Dec 2022 21:24:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D631FE089C for ; Sun, 11 Dec 2022 21:24:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 06B313411CE for ; Sun, 11 Dec 2022 21:24:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB9CC7ED for ; Sun, 11 Dec 2022 21:24:33 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1670793864.6ef20dc0d29303c86b5deb134dfeaeb8654eb040.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: Documentation/maintainers/new/ X-VCS-Repository: proj/kde X-VCS-Files: Documentation/maintainers/new/frameworks-bump.sh Documentation/maintainers/new/gear-bump.sh Documentation/maintainers/new/lib.sh Documentation/maintainers/new/plasma-bump.sh X-VCS-Directories: Documentation/maintainers/new/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6ef20dc0d29303c86b5deb134dfeaeb8654eb040 X-VCS-Branch: master Date: Sun, 11 Dec 2022 21:24:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7f1a4153-7667-406d-919b-3d1a082854a0 X-Archives-Hash: 998eda39d29fe35b2c0e9a9caac33aa5 commit: 6ef20dc0d29303c86b5deb134dfeaeb8654eb040 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 11 16:42:58 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 11 21:24:24 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6ef20dc0 Documentation: lib.sh: create_keywords_files: Drop base name hack Requires providing second argument. Signed-off-by: Andreas Sturmlechner gentoo.org> Documentation/maintainers/new/frameworks-bump.sh | 2 +- Documentation/maintainers/new/gear-bump.sh | 2 +- Documentation/maintainers/new/lib.sh | 10 +++++----- Documentation/maintainers/new/plasma-bump.sh | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/maintainers/new/frameworks-bump.sh b/Documentation/maintainers/new/frameworks-bump.sh index 1d51c345f5..243f46d61e 100755 --- a/Documentation/maintainers/new/frameworks-bump.sh +++ b/Documentation/maintainers/new/frameworks-bump.sh @@ -42,7 +42,7 @@ pushd "${TARGET_REPO}" > /dev/null bump_set_from_live kde-frameworks ${major_version} mask_from_live_set kde-frameworks ${VERSION} ${kfv} mark_unreleased frameworks ${VERSION} -create_keywords_files ${kfmv} +create_keywords_files ${kfmv} ${set} sed -i -e "/KF_RELEASES/s/\"$/ ${major_version}\"/" Documentation/maintainers/regenerate-files Documentation/maintainers/regenerate-files diff --git a/Documentation/maintainers/new/gear-bump.sh b/Documentation/maintainers/new/gear-bump.sh index 853c1927e6..4d4fc7067e 100755 --- a/Documentation/maintainers/new/gear-bump.sh +++ b/Documentation/maintainers/new/gear-bump.sh @@ -42,7 +42,7 @@ pushd "${TARGET_REPO}" > /dev/null if ! [[ -f sets/kde-gear-${major_version} ]]; then bump_set_from_live kde-gear ${major_version} - create_keywords_files ${kfmv} + create_keywords_files ${kfmv} kde-gear sed -i -e "/GEAR_RELEASES/s/\"$/ ${major_version}\"/" Documentation/maintainers/regenerate-files Documentation/maintainers/regenerate-files diff --git a/Documentation/maintainers/new/lib.sh b/Documentation/maintainers/new/lib.sh index d6317e1fa3..59bdcef983 100755 --- a/Documentation/maintainers/new/lib.sh +++ b/Documentation/maintainers/new/lib.sh @@ -101,16 +101,16 @@ commit_packages() { } # @FUNCTION: create_keywords_files -# @USAGE: +# @USAGE: # @DESCRIPTION: -# Creates new package.{accept_keywords,unmask,mask}/ files based on -# live dirs and referencing including any subsets. +# Creates new package.{accept_keywords,unmask,mask}/ files based on +# -live dirs and referencing including any subsets. create_keywords_files() { local target="${1}" - local base=${target/%-[0-9.]*/} + local base="${2}" local x - if [[ $# -gt 1 ]]; then + if [[ $# -gt 2 ]]; then echo "${FUNCNAME[0]}: error: must be passed exactly one argument!" return fi diff --git a/Documentation/maintainers/new/plasma-bump.sh b/Documentation/maintainers/new/plasma-bump.sh index e567fe8763..978f9cc857 100755 --- a/Documentation/maintainers/new/plasma-bump.sh +++ b/Documentation/maintainers/new/plasma-bump.sh @@ -42,7 +42,7 @@ pushd "${TARGET_REPO}" > /dev/null if ! [[ -f sets/kde-plasma-${major_version} ]]; then bump_set_from_live kde-plasma ${major_version} # TODO: s/49.9999/50:5/ - create_keywords_files ${kfmv} + create_keywords_files ${kfmv} kde-plasma sed -i -e "/PLASMA_RELEASES/s/\"$/ ${major_version}\"/" Documentation/maintainers/regenerate-files Documentation/maintainers/regenerate-files