Made EMERGE_WARNING_DELAY=0 for all stages. This is 2.0_rc7.

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

diff --git a/ChangeLog b/ChangeLog
index f2832edf68173852c81f1bfdd352e7fa9a049860..caa420a4f7b007569762be878bed30e1d45bbbdd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.430 2005/12/07 21:01:35 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.431 2005/12/07 21:33:43 wolf31o2 Exp $
+
+  07 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/livecd-stage1/livecd-stage1-chroot.sh,
+  targets/stage1/stage1-chroot.sh, targets/stage2/stage2-chroot.sh,
+  targets/stage3/stage3-chroot.sh, targets/stage4/stage4-chroot.sh:
+  Made EMERGE_WARNING_DELAY=0 for all stages.  This is 2.0_rc7.
 
   07 Dec 2005; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py, modules/generic_target.py:

diff --git a/catalyst b/catalyst
index 64a5570a0bf59cf3408a2b0659230ba20a3b95e3..006e89e4bbf6826a218eacc5fa49119c7c00851c 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.109 2005/12/07 16:19:55 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.110 2005/12/07 21:33:43 wolf31o2 Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -10,7 +10,7 @@
 import os,sys,imp,string,getopt
 import pdb
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0_rc6"
+__version__="2.0_rc7"
 
 conf_values={}
 

diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
index 51c7df48696de3ec19d184226e7dae87e300593b..b5f84dd9db6e68b76d2445f0d495bf942022288d 100755 (executable)
--- a/targets/livecd-stage1/livecd-stage1-chroot.sh
+++ b/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/livecd-stage1-chroot.sh,v 1.19 2005/11/29 20:15:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.20 2005/12/07 21:33:43 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -15,6 +15,7 @@ setup_myemergeopts
 
 export FEATURES="${clst_myfeatures}"
 export CONFIG_PROTECT="-*"
+export EMERGE_WARNING_DELAY=0
 
 ## START BUILD
 setup_portage

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index f8cb0a5600fb5994540af6435f310ad931342080..a5695441ef0a56d2e850f2991c5c22646435bd46 100755 (executable)
--- a/targets/stage1/stage1-chroot.sh
+++ b/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/stage1-chroot.sh,v 1.37 2005/11/30 21:34:03 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-chroot.sh,v 1.38 2005/12/07 21:33:43 wolf31o2 Exp $
        
 
 . /tmp/chroot-functions.sh
@@ -19,6 +19,7 @@ export clst_buildpkgs="$(/tmp/build.py)"
 export STAGE1_USE="$(portageq envvar STAGE1_USE)"
 export USE="-* build ${STAGE1_USE}"
 export FEATURES="${clst_myfeatures} nodoc noman noinfo"
+export EMERGE_WARNING_DELAY=0
 
 ## Sanity check profile
 if [ -z "${clst_buildpkgs}" ]

diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
index 44753db13e72cba18b82d206736bc5e4e4de73e9..7ae088c2519511858e8106a95c13b692ecc1c77d 100755 (executable)
--- a/targets/stage2/stage2-chroot.sh
+++ b/targets/stage2/stage2-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/stage2/stage2-chroot.sh,v 1.15 2005/08/09 19:02:31 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/stage2-chroot.sh,v 1.16 2005/12/07 21:33:43 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -13,6 +13,7 @@ setup_myemergeopts
 
 ## setup the environment
 export FEATURES="${clst_myfeatures} nodoc noman noinfo"
+export EMERGE_WARNING_DELAY=0
 
 if [ "${clst_VERBOSE}" ]
 then

diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
index d425c57da0b08ebfe147832036771e867121c36d..d2ae6af7bd0379f5f031cc35e9d83566a2852645 100755 (executable)
--- a/targets/stage3/stage3-chroot.sh
+++ b/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/stage3-chroot.sh,v 1.22 2005/07/07 22:19:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-chroot.sh,v 1.23 2005/12/07 21:33:43 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 check_portage_version
@@ -16,7 +16,7 @@ setup_myemergeopts
 export FEATURES="${clst_myfeatures}"
 export CONFIG_PROTECT="-*"
 export USE="${USE} ${clst_HOSTUSE}"
-
+export EMERGE_WARNING_DELAY=0
 
 ## START BUILD
 # portage needs to be merged manually with USE="build" set to avoid frying our

diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
index 4f9ad284bcb4e50f0f98c21d31c3557c3bb32950..4a94fd7e07ce85f4c095c8a055b50c8ce3f7138a 100755 (executable)
--- a/targets/stage4/stage4-chroot.sh
+++ b/targets/stage4/stage4-chroot.sh
@@ -21,6 +21,7 @@ export USE_ORDER="env:pkg:conf:defaults"
 
 echo "Bringing system up to date using profile specific use flags"
 export USE="${USE} ${clst_HOSTUSE}"
+export EMERGE_WARNING_DELAY=0
 run_emerge -u system