diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-04-30 00:01:05 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-04-30 00:01:05 +0000 |
| commit | d5b3fc3edf4e91bb967b16067887df296b1206b0 (patch) | |
| tree | d33c99f06b5557d2aeb15b7952c9532072ba5f3a /profiles/base | |
| parent | New release version, as usual thanks to Enrico Tagliavini <enrico.tagliavini@... (diff) | |
| download | historical-d5b3fc3edf4e91bb967b16067887df296b1206b0.tar.gz historical-d5b3fc3edf4e91bb967b16067887df296b1206b0.tar.bz2 historical-d5b3fc3edf4e91bb967b16067887df296b1206b0.zip | |
29 Apr 2010; Zac Medico <zmedico@gentoo.org> profile.bashrc:
Skip /etc/portage/env code if PM_EBUILD_HOOK_DIR is set since this means
that /etc/portage/env is supported by the package manager:
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ef2024a33be93a256beef28c1423ba1fb706383d
Diffstat (limited to 'profiles/base')
| -rw-r--r-- | profiles/base/ChangeLog | 8 | ||||
| -rw-r--r-- | profiles/base/profile.bashrc | 18 |
2 files changed, 19 insertions, 7 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog index 48e6ad103f7b..fcbf4a4f520b 100644 --- a/profiles/base/ChangeLog +++ b/profiles/base/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for Gentoo base-profile # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.140 2010/04/29 09:23:39 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.141 2010/04/30 00:01:05 zmedico Exp $ + + 29 Apr 2010; Zac Medico <zmedico@gentoo.org> profile.bashrc: + Skip /etc/portage/env code if PM_EBUILD_HOOK_DIR is set since this means + that /etc/portage/env is supported by the package manager: + http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ef202 + 4a33be93a256beef28c1423ba1fb706383d 29 Apr 2010; Peter Volkov <pva@gentoo.org> make.defaults: Add XTABLES_ADDONS as discussed in -dev on 18.01.2010 (but dropped diff --git a/profiles/base/profile.bashrc b/profiles/base/profile.bashrc index c5a9580c1c98..d560dd0f6dec 100644 --- a/profiles/base/profile.bashrc +++ b/profiles/base/profile.bashrc @@ -1,11 +1,17 @@ -# Copyright 2006-2009 Gentoo Foundation +# Copyright 2006-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/profile.bashrc,v 1.5 2010/01/24 17:58:52 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/profile.bashrc,v 1.6 2010/04/30 00:01:05 zmedico Exp $ -for conf in ${PN} ${PN}-${PV} ${PN}-${PV}-${PR}; do - [[ -r ${PORTAGE_CONFIGROOT}/etc/portage/env/${CATEGORY}/${conf} ]] \ - && . ${PORTAGE_CONFIGROOT}/etc/portage/env/${CATEGORY}/${conf} -done +# Skip this if PM_EBUILD_HOOK_DIR is set since this means that +# /etc/portage/env is supported by the package manager: +# http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ef2024a33be93a256beef28c1423ba1fb706383d +if [[ -z $PM_EBUILD_HOOK_DIR && \ + -d ${PORTAGE_CONFIGROOT}/etc/portage/env ]] ; then + for conf in ${PN} ${PN}-${PV} ${PN}-${PV}-${PR}; do + [[ -r ${PORTAGE_CONFIGROOT}/etc/portage/env/${CATEGORY}/${conf} ]] \ + && . ${PORTAGE_CONFIGROOT}/etc/portage/env/${CATEGORY}/${conf} + done +fi if ! declare -F elog >/dev/null ; then elog() { |