From 3c9145d76d9780f5dede973948a8fd8b72c49166 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 11 Mar 2008 17:41:45 +0000 Subject: [PATCH] We should only use --noreplace when building a pkgset, everything else should be a fetch. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1370 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 +++++ targets/grp/grp-chroot.sh | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90aa1a1a..6f0ad55d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 11 Mar 2008; Chris Gianelloni + targets/grp/grp-chroot.sh: + We should only use --noreplace when building a pkgset, everything else + should be a fetch. + 11 Mar 2008; Andrew Gaffney modules/catalyst_support.py, modules/generic_stage_target.py, modules/grp_target.py: diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh index 66b95636..6690c91b 100755 --- a/targets/grp/grp-chroot.sh +++ b/targets/grp/grp-chroot.sh @@ -8,12 +8,14 @@ setup_pkgmgr export DISTDIR="/tmp/grp/${clst_grp_target}" export PKGDIR="/tmp/grp/${clst_grp_target}" -if [ "${clst_grp_type}" != "pkgset" ] +if [ "${clst_grp_type}" = "pkgset" ] then + export clst_myemergeopts="${clst_myemergeopts} --noreplace" +else export clst_FETCH=1 # This is necessary since we're setting the above variable and the emerge # opts have already been set setup_myemergeopts fi -run_merge --noreplace ${clst_grp_packages} || exit 1 +run_merge ${clst_grp_packages} || exit 1 -- 2.26.2