diff options
author | Eric Edgar <rocket@gentoo.org> | 2005-07-07 21:23:11 +0000 |
---|---|---|
committer | Eric Edgar <rocket@gentoo.org> | 2005-07-07 21:23:11 +0000 |
commit | 2b8fa998ddd59220f98c841580c312d1eb177a6a (patch) | |
tree | 013ef1bf7fc1b8064853dd598eb0febd04857292 | |
parent | Fix bindist invocation. (diff) | |
download | gentoo-2b8fa998ddd59220f98c841580c312d1eb177a6a.tar.gz gentoo-2b8fa998ddd59220f98c841580c312d1eb177a6a.tar.bz2 gentoo-2b8fa998ddd59220f98c841580c312d1eb177a6a.zip |
Fix Pylons Fetch issue
-rw-r--r-- | src/catalyst/ChangeLog | 7 | ||||
-rw-r--r-- | src/catalyst/modules/catalyst_support.py | 3 | ||||
-rw-r--r-- | src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh | 12 | ||||
-rw-r--r-- | src/catalyst/targets/stage1/stage1-chroot.sh | 12 | ||||
-rw-r--r-- | src/catalyst/targets/stage3/stage3-chroot.sh | 12 |
5 files changed, 26 insertions, 20 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog index 1016c0bc24..5ddd82fb17 100644 --- a/src/catalyst/ChangeLog +++ b/src/catalyst/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.83 2005/07/07 19:57:28 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.84 2005/07/07 21:23:10 rocket Exp $ + + 07 Jul 2005; Eric Edgar <rocket@gentoo.org> modules/catalyst_support.py, + targets/livecd-stage1/livecd-stage1-chroot.sh, + targets/stage1/stage1-chroot.sh, targets/stage3/stage3-chroot.sh: + Fix Pylons Fetch issue 07 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> modules/grp_target.py, targets/grp/grp-chroot.sh: diff --git a/src/catalyst/modules/catalyst_support.py b/src/catalyst/modules/catalyst_support.py index 06e42755ae..592b5d9e68 100644 --- a/src/catalyst/modules/catalyst_support.py +++ b/src/catalyst/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/Attic/catalyst_support.py,v 1.34.2.3 2005/07/06 18:49:56 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/catalyst_support.py,v 1.34.2.4 2005/07/07 21:23:10 rocket Exp $ import sys,string,os,types,re,traceback @@ -20,6 +20,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("options") valid_config_file_values.append("DEBUG") valid_config_file_values.append("VERBOSE") diff --git a/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh b/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh index 56c94d7149..adf309c82a 100644 --- a/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh +++ b/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1-chroot.sh,v 1.15.2.1 2005/07/05 21:47:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1-chroot.sh,v 1.15.2.2 2005/07/07 21:23:11 rocket Exp $ portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ | cut -d/ -f2 | cut -d- -f2,3` @@ -38,11 +38,6 @@ else export clst_emergeopts="" fi -if [ -n "${clst_FETCH}" ] -then - export clst_emergeopts="${clst_emergeopts} -f" -fi - ## setup the environment export FEATURES="${clst_myfeatures}" export CONFIG_PROTECT="-*" @@ -64,4 +59,9 @@ then fi fi +if [ -n "${clst_FETCH}" ] +then + emerge ${clst_emergeopts} -f ${clst_packages} +fi + emerge ${clst_emergeopts} ${clst_packages} diff --git a/src/catalyst/targets/stage1/stage1-chroot.sh b/src/catalyst/targets/stage1/stage1-chroot.sh index ae867b6f8f..25e13d9bb6 100644 --- a/src/catalyst/targets/stage1/stage1-chroot.sh +++ b/src/catalyst/targets/stage1/stage1-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1-chroot.sh,v 1.29.2.5 2005/07/06 19:05:29 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1-chroot.sh,v 1.29.2.6 2005/07/07 21:23:11 rocket Exp $ portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ | cut -d/ -f2 | cut -d- -f2,3` @@ -47,11 +47,6 @@ then export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse" fi -if [ -n "${clst_FETCH}" ] -then - export clst_myemergeopts="${clst_myemergeopts} -f" -fi - # setup our environment export FEATURES="${clst_myfeatures}" export ROOT=${1} @@ -82,4 +77,9 @@ then fi fi +if [ -n "${clst_FETCH}" ] +then + USE="-* build ${STAGE1_USE}" emerge ${clst_myemergeopts} -f --noreplace ${clst_buildpkgs} || exit 1 +fi + USE="-* build ${STAGE1_USE}" emerge ${clst_myemergeopts} --noreplace ${clst_buildpkgs} || exit 1 diff --git a/src/catalyst/targets/stage3/stage3-chroot.sh b/src/catalyst/targets/stage3/stage3-chroot.sh index 68c1348741..f144466ac4 100644 --- a/src/catalyst/targets/stage3/stage3-chroot.sh +++ b/src/catalyst/targets/stage3/stage3-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3-chroot.sh,v 1.17.2.3 2005/07/07 16:59:50 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3-chroot.sh,v 1.17.2.4 2005/07/07 21:23:11 rocket Exp $ portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ | cut -d/ -f2 | cut -d- -f2,3` @@ -36,11 +36,6 @@ then export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse" fi -if [ -n "${clst_FETCH}" ] -then - export clst_myemergeopts="${clst_myemergeopts} -f" -fi - # setup the build environment export FEATURES="${clst_myfeatures}" export USE="-* ${clst_HOSTUSE}" @@ -59,4 +54,9 @@ then fi fi +if [ -n "${clst_FETCH}" ] +then + emerge -e ${clst_myemergeopts} -f system || exit 1 +fi + emerge -e ${clst_myemergeopts} system || exit 1 |