summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-03-31 00:18:42 +0000
committerMike Frysinger <vapier@gentoo.org>2005-03-31 00:18:42 +0000
commit0c77ac2bb20c32422dc0ba0189d4f0c7aacf68ae (patch)
tree02f0d3e8112754ad5d9eaf6509a66994f77cb7cb /profiles
parentQA fixes; Updates (diff)
downloadgentoo-2-0c77ac2bb20c32422dc0ba0189d4f0c7aacf68ae.tar.gz
gentoo-2-0c77ac2bb20c32422dc0ba0189d4f0c7aacf68ae.tar.bz2
gentoo-2-0c77ac2bb20c32422dc0ba0189d4f0c7aacf68ae.zip
dont do something stupid like error when using repoman
Diffstat (limited to 'profiles')
-rw-r--r--profiles/default-linux/amd64/2005.0/profile.bashrc3
1 files changed, 2 insertions, 1 deletions
diff --git a/profiles/default-linux/amd64/2005.0/profile.bashrc b/profiles/default-linux/amd64/2005.0/profile.bashrc
index 9da7474ae7f3..461812783482 100644
--- a/profiles/default-linux/amd64/2005.0/profile.bashrc
+++ b/profiles/default-linux/amd64/2005.0/profile.bashrc
@@ -1,6 +1,7 @@
# The version of profile in our 'packages' does not yet set ABI for us nor
# export the CFLAGS_${ABI} envvars... The multilib-pkg patch does, but this
# won't be in portage until atleast .52_pre
+
if [ -n "${ABI}" ]; then
export ABI
elif [ -n "${DEFAULT_ABI}" ]; then
@@ -13,7 +14,7 @@ export CFLAGS_amd64
export CFLAGS_x86
# Make sure they updated to 2005.0 properly
-if [ -L /lib32 -o -L /usr/lib32 ]; then
+if [ -L /lib32 -o -L /usr/lib32 ] && [ ${PORTAGE_CALLER} != "repoman" ] ; then
eerror "It appears you have switched to the 2005.0 profile without following"
eerror "the upgrade guide. Please see the following URL for more information:"
eerror "http://www.gentoo.org/proj/en/base/amd64/2005.0-upgrade-amd64.xml"