Fixed fetchonly option for stages 1 through 3 and livecd-stage1, and possibly others.

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

diff --git a/ChangeLog b/ChangeLog
index 8825740677f861dd2a097af338ff8318bd1e8a3d..9b4ecab99c82da3a5c8986944c96a7661b35b987 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.598 2006/04/17 21:41:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.599 2006/04/18 20:38:24 wolf31o2 Exp $
+
+  18 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/chroot-functions.sh:
+  Fixed fetchonly option for stages 1 through 3 and livecd-stage1, and
+  possibly others.
 
   17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/stage1/build.py:

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 8139a701e626cbc3b159f2d379eecce3eeb246af..4372dcadb64642e7e52492c58e7cafaa8ac1a9fa 100755 (executable)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -69,6 +69,11 @@ setup_myemergeopts(){
                export clst_myemergeopts="--usepkg --buildpkg --newuse"
                export bootstrap_opts="-r"
        fi
+       if [ -n "${clst_FETCH}" ]
+       then
+               export bootstrap_opts="-f"
+               export clst_myemergeopts="{clst_myemergeopts} -f"
+       fi
 }
 
 
@@ -162,12 +167,6 @@ run_emerge() {
 
        echo "emerge ${clst_myemergeopts} $@" || exit 1
 
-       if [ -n "${clst_FETCH}" ]
-       then
-               export bootstrap_opts="-f"
-               emerge ${clst_myemergeopts} -f $@ || exit 1
-       fi
-
        emerge ${clst_myemergeopts} $@ || exit 1
 }