[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

["Johannes Huber" <johu@gentoo.org>]

commit:     efa970b4d1cfabadacbf108453745ec85c36fcee
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 23:08:20 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> 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