Don't set --usepkg and --buildpkg when fetching

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1365 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index ea5341ee0e2836875ae731dd321931b0d1e1d6eb..f523dad4351195a78578baf9011876e13a91ee19 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  10 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
+  targets/support/chroot-functions.sh:
+  Don't set --usepkg and --buildpkg when fetching
+
   07 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/generic_stage_target.py:
   Change the warning thrown into make.conf when someone uses LDFLAGS so it is

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 38a7af8fbf5a6384eeb3ad4abbabd3a97b92363c..22284711ce59d78d9005b1742e34a91abc9c1bfa 100755 (executable)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -119,7 +119,7 @@ setup_myemergeopts(){
        then
                export bootstrap_opts="-f"
                export clst_myemergeopts="${clst_myemergeopts} -f"
-       elif [ -n "${clst_PKGCACHE}" ]
+       elif [ -n "${clst_PKGCACHE}" -a -z "${clst_FETCH}" ]
        then
                export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse"
                export bootstrap_opts="-r"