We should only use --noreplace when building a pkgset, everything else should be...

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

diff --git a/ChangeLog b/ChangeLog
index 90aa1a1a739371f140db1a63e33722d412a91ede..6f0ad55db0af018076862b16b65d5e0f17e29eb1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  11 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  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 <agaffney@gentoo.org>
   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 66b95636eecd7fbed0d5c8f46acd3c2e68f1693f..6690c91b71bec8243c55d705a09aead47b7d5204 100755 (executable)
--- 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