From: Andrew Gaffney Date: Mon, 10 Mar 2008 18:06:59 +0000 (+0000) Subject: Don't set --usepkg and --buildpkg when fetching X-Git-Tag: CATALYST_2_0_6_916~129 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9e6b256989d30d3246ae4cb28def8feaef8b33a9;p=catalyst.git 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 ea5341ee..f523dad4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 10 Mar 2008; Andrew Gaffney + targets/support/chroot-functions.sh: + Don't set --usepkg and --buildpkg when fetching + 07 Mar 2008; Chris Gianelloni 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 38a7af8f..22284711 100755 --- 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"