Added --noreplace to setup_myfeatures merges so we don't blow away any packages which...

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

diff --git a/ChangeLog b/ChangeLog
index a0b37214e728dfb545269caa5584352494c9d571..110edb9bbdf5958e21bd57c4898daa508ff102d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  27 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/chroot-functions.sh:
+  Added --noreplace to setup_myfeatures merges so we don't blow away any
+  packages which are already installed with the proper USE flags for the given
+  target. This is for bug #211654. This is catalyst 2.0.6_pre16 for testing.
+
   27 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   livecd/files/README.txt:
   Added dosshd, passwd=, and nonfs to README.txt, since they were missing.

diff --git a/catalyst b/catalyst
index 01695ea59a36a5d17d1895fe810a3dcd2c7bd9b6..13ff0b6363ab8ba49d618fb26683f71d6d378392 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -8,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.6_pre15"
+__version__="2.0.6_pre16"
 
 conf_values={}
 

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 38a7af8fbf5a6384eeb3ad4abbabd3a97b92363c..041de496cfe4723d18f63a8475eb28e8fac2bd51 100755 (executable)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -64,7 +64,7 @@ setup_myfeatures(){
        if [ -n "${clst_CCACHE}" ]
        then
                export clst_myfeatures="${clst_myfeatures} ccache"
-               clst_root_path=/ run_merge --oneshot --nodeps dev-util/ccache || exit 1
+               clst_root_path=/ run_merge --oneshot --nodeps --noreplace dev-util/ccache || exit 1
        fi
 
        if [ -n "${clst_DISTCC}" ]
@@ -73,7 +73,7 @@ setup_myfeatures(){
                export DISTCC_HOSTS="${clst_distcc_hosts}"
                [ -e /etc/make.conf ] && \
                        echo 'USE="${USE} -avahi -gtk -gnome"' >> /etc/make.conf
-               clst_root_path=/ run_merge --oneshot --nodeps sys-devel/distcc || exit 1
+               clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc || exit 1
                sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf
                mkdir -p /etc/distcc
                echo "${clst_distcc_hosts}" > /etc/distcc/hosts
@@ -91,7 +91,7 @@ setup_myfeatures(){
 
        if [ -n "${clst_ICECREAM}" ]
        then
-               clst_root_path=/ run_merge --oneshot --nodeps sys-devel/icecream || exit 1
+               clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/icecream || exit 1
 
                # This sets up automatic cross-icecc-fu according to
                # http://gentoo-wiki.com/HOWTO_Setup_An_ICECREAM_Compile_Cluster#Icecream_and_cross-compiling