From abff2b2e8f20f89c2d3cbcebadde365bdbc33eec Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Mon, 14 May 2007 14:08:39 +0000 Subject: Allow svn repoman. (Portage 2.1.2.4-prefix/SVN/Linux 2.6.20-gentoo-r6 Intel(R) Pentium(R) M processor 1.60GHz) svn path=/; revision=119 --- app-portage/drizzt-scripts/ChangeLog | 6 ++++++ app-portage/drizzt-scripts/files/ecommit | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app-portage/drizzt-scripts/ChangeLog b/app-portage/drizzt-scripts/ChangeLog index 7d9b81f..4bd2a91 100644 --- a/app-portage/drizzt-scripts/ChangeLog +++ b/app-portage/drizzt-scripts/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 14 May 2007; Timothy Redaelli files/ecommit: + Allow svn repoman. + + 14 May 2007; Timothy Redaelli files/ecommit: + Allow svn repoman. + 07 Mar 2007; Timothy Redaelli ChangeLog: Bump diff --git a/app-portage/drizzt-scripts/files/ecommit b/app-portage/drizzt-scripts/files/ecommit index d56d094..622a80d 100644 --- a/app-portage/drizzt-scripts/files/ecommit +++ b/app-portage/drizzt-scripts/files/ecommit @@ -13,7 +13,7 @@ function hasq() { [[ " ${*:2} " == *" $1 "* ]] } -if [[ -e "$(which keychain)" ]] && hasq sign ${FEATURES}; then +if [[ -e "$(type -P keychain)" ]] && hasq sign ${FEATURES}; then keychain --agents gpg "$(portageq envvar PORTAGE_GPG_KEY)" source "${HOME}/.keychain/${HOSTNAME}-sh-gpg" fi @@ -21,7 +21,7 @@ fi "${EDITOR}" "$commitmsg" ECHANGELOG_EDITOR= echangelog < "$commitmsg" -if [[ -d .svn ]]; then +if ( ! fgrep -q '.svn' "$(type -P repoman)" ) && [[ -d .svn ]]; then svn add ChangeLog &>/dev/null ebegin "Digesting ebuilds" hasq sign ${FEATURES} && rm -f Manifest -- cgit v1.2.3-65-gdbad