From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 33FF31387B1 for ; Tue, 3 Dec 2013 23:09:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F476E0B51; Tue, 3 Dec 2013 23:09:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D937CE0B51 for ; Tue, 3 Dec 2013 23:09:11 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7DD7233EFCB for ; Tue, 3 Dec 2013 23:09:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 35D64E54D1 for ; Tue, 3 Dec 2013 23:09:09 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1386112100.efa970b4d1cfabadacbf108453745ec85c36fcee.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: Documentation/maintainers/ X-VCS-Repository: proj/kde X-VCS-Files: Documentation/maintainers/bump_new_revision.sh X-VCS-Directories: Documentation/maintainers/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: efa970b4d1cfabadacbf108453745ec85c36fcee X-VCS-Branch: master Date: Tue, 3 Dec 2013 23:09:09 +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-Archives-Salt: c73023bb-71d5-4eb9-b9c7-bda719faf074 X-Archives-Hash: f688387ab7c11e042903e468e091e213 commit: efa970b4d1cfabadacbf108453745ec85c36fcee Author: Johannes Huber gentoo org> AuthorDate: Tue Dec 3 23:08:20 2013 +0000 Commit: Johannes Huber gentoo org> CommitDate: Tue Dec 3 23:08:20 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=efa970b4 [Documentation] Fix bumptool git version removal --- Documentation/maintainers/bump_new_revision.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/maintainers/bump_new_revision.sh b/Documentation/maintainers/bump_new_revision.sh index 0c8bb16..01210d0 100755 --- a/Documentation/maintainers/bump_new_revision.sh +++ b/Documentation/maintainers/bump_new_revision.sh @@ -299,7 +299,8 @@ case ${OPERATION} in EBUILD_BASENAME=${EBUILD_BASEDIR/*\//} pushd "${PORTDIR_BUMPING}"/"${EBUILD_BASEDIR}" > /dev/null if [[ -d "${PORTDIR_BUMPING}/.git" ]]; then - git rm "${EBUILD_BASENAME}-${VERSION}"*.ebuild + EBUILD=`find ./ -name \*.ebuild | grep "${VERSION}\(\-r[0-9]\+\)\?\\." | sort |tail -n 1` + git rm "${EBUILD}" elif [[ -d CVS ]]; then cvs remove -f "${EBUILD_BASENAME}-${VERSION}"*.ebuild echangelog "Remove KDE SC ${VERSION}" @@ -330,7 +331,7 @@ case ${OPERATION} in # fi repoman manifest if [[ -d "${PORTDIR_BUMPING}/.git" ]]; then - git add . + git add --all . fi popd &> /dev/null #go back to workdir done