[gentoo-commits] gentoo-x86 commit in profiles/base: ChangeLog profile.bashrc

[Zac Medico (zmedico)]

zmedico     10/04/30 00:01:06

  Modified:             ChangeLog profile.bashrc
  Log:
  29 Apr 2010; Zac Medico <zmedico@g.o> 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

Revision  Changes    Path
1.141                profiles/base/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/base/ChangeLog?rev=1.141&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/base/ChangeLog?rev=1.141&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/base/ChangeLog?r1=1.140&r2=1.141

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- ChangeLog	29 Apr 2010 09:23:39 -0000	1.140
+++ ChangeLog	30 Apr 2010 00:01:05 -0000	1.141
@@ -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@g.o> 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@g.o> make.defaults:
   Add XTABLES_ADDONS as discussed in -dev on 18.01.2010 (but dropped



1.6                  profiles/base/profile.bashrc

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/base/profile.bashrc?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/base/profile.bashrc?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/base/profile.bashrc?r1=1.5&r2=1.6

Index: profile.bashrc
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/base/profile.bashrc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- profile.bashrc	24 Jan 2010 17:58:52 -0000	1.5
+++ profile.bashrc	30 Apr 2010 00:01:05 -0000	1.6
@@ -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() {