Fix FETCH code so it will run for Pylon

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

diff --git a/ChangeLog b/ChangeLog
index 8e889bbb1e3ac8537fc44c4faba14c364298a5ef..a3b13727a50809f57cef78f46fc732027cd92ddb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.302 2005/07/07 19:57:17 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.303 2005/07/07 21:35:00 rocket Exp $
+
+  07 Jul 2005; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py,
+  targets/support/chroot-functions.sh:
+  Fix FETCH code so it will run for Pylon
 
   07 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> modules/grp_target.py,
   targets/grp/grp-chroot.sh:

diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
index 02a0ca5e3e91b19ef80fba720f988f2fa80df81a..1a7e19161695c21cb6428946231e0b75f716ad69 100644 (file)
--- a/modules/catalyst_support.py
+++ b/modules/catalyst_support.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/catalyst_support.py,v 1.50 2005/07/06 18:28:13 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/catalyst_support.py,v 1.51 2005/07/07 21:35:00 rocket Exp $
 
 import sys,string,os,types,re,signal,traceback,md5,time
 selinux_capable = False
@@ -106,6 +106,7 @@ valid_config_file_values.append("CCACHE")
 valid_config_file_values.append("DISTCC")
 valid_config_file_values.append("ENVSCRIPT")
 valid_config_file_values.append("AUTORESUME")
+valid_config_file_values.append("FETCH")
 valid_config_file_values.append("CLEAR_AUTORESUME")
 valid_config_file_values.append("options")
 valid_config_file_values.append("DEBUG")

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 9ea83bb5d24f3ad974265b7737400ada2b8b10df..0b74fecdd5b29a5904fd478792c2562f7d3e2d1c 100755 (executable)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -81,12 +81,6 @@ setup_myemergeopts(){
                export clst_myemergeopts="--usepkg --buildpkg --newuse"
                export bootstrap_opts="-r"
        fi
-
-       if [ -n "${clst_FETCH}" ]
-       then
-               export clst_myemergeopts="${clst_myemergeopts} -f"
-               export bootstrap_opts="-f"
-       fi
 }
 
 
@@ -169,7 +163,15 @@ run_emerge() {
                        read -s -n 1
                fi
        fi
+
        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
 }