From 533b5c2bb803cd0e51f5db563a7e276d8f260054 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Wed, 26 Mar 2008 21:29:09 +0000
Subject: [PATCH] [sde-config] Renamed $SDECFG_ABORT_ON_ERROR_AFTER to
 $SDECFG_CONTINUE_ON_ERROR_AFTER which adjusts better to the logic behind

---
 lib/misc/regtest.sh       | 2 +-
 lib/sde-config/config.hlp | 4 ++--
 lib/sde-config/main.in    | 2 +-
 scripts/Build-Pkg         | 2 +-
 scripts/Build-Target      | 4 ++--
 scripts/Emerge-Pkg        | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/misc/regtest.sh b/lib/misc/regtest.sh
index aa1202f..ef61a18 100755
--- a/lib/misc/regtest.sh
+++ b/lib/misc/regtest.sh
@@ -45,7 +45,7 @@ build()
 		SDECFG_ARCH=$x
 		SDECFG_CROSSBUILD=1
 		SDECFG_PKG_CCACHE_USEIT=1
-		SDECFG_ABORT_ON_ERROR_AFTER=0
+		SDECFG_CONTINUE_ON_ERROR_AFTER=0
 		SDECFG_ALWAYS_CLEAN=1
 		SDECFG_XTRACE=1
 		SDECFG_EXPERT=1
diff --git a/lib/sde-config/config.hlp b/lib/sde-config/config.hlp
index eb6c08f..906520e 100644
--- a/lib/sde-config/config.hlp
+++ b/lib/sde-config/config.hlp
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: lib/sde-config/config.hlp
-# Copyright (C) 2006 The OpenSDE Project
+# Copyright (C) 2006 - 2008 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -74,7 +74,7 @@ SDECFG_PARALLEL_MAX
   to be kept active. This option is used by make and scons - and should
   also be defined when you use distcc to perform distributed builds.
 
-SDECFG_ABORT_ON_ERROR_AFTER
+SDECFG_CONTINUE_ON_ERROR_AFTER
   The build will continue after a package build error only on an stage
   greater than the value selected
 
diff --git a/lib/sde-config/main.in b/lib/sde-config/main.in
index ba3abb2..5ddcdd7 100644
--- a/lib/sde-config/main.in
+++ b/lib/sde-config/main.in
@@ -190,7 +190,7 @@ fi
 comment ' '
 comment_id '- Build System Configuration' COMMENT_BUILD_SYS_CONF
 block_begin 3
-		choice SDECFG_ABORT_ON_ERROR_AFTER 4 \
+		choice SDECFG_CONTINUE_ON_ERROR_AFTER 4 \
 			0	'Continue if package-build fails after toolchain (native)'	\
 			1	'Continue if package-build fails after toolchain (cross)'	\
 			2	'Continue if package-build fails after stage 2'	\
diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg
index 878edc9..17d4741 100755
--- a/scripts/Build-Pkg
+++ b/scripts/Build-Pkg
@@ -132,7 +132,7 @@ fi
 if [ $# -gt 1 ] ; then
     for x ; do
 	if ! ./scripts/Build-Pkg $options $x && \
-	   [ $stagelevel -le "$SDECFG_ABORT_ON_ERROR_AFTER" ] ; then
+	   [ $stagelevel -le "$SDECFG_CONTINUE_ON_ERROR_AFTER" ] ; then
 		exit 1
 	fi
     done
diff --git a/scripts/Build-Target b/scripts/Build-Target
index d71f4de..380f3d5 100755
--- a/scripts/Build-Target
+++ b/scripts/Build-Target
@@ -82,7 +82,7 @@ pkgloop() {
 	  if [ "`ls ${build_root}/var/adm/logs/*.err 2> /dev/null`" ] ; then
 		echo_header "Removing old error logs ..."
 		for y in 0 1 2 3 4 5 6 7 8 9; do
-			if [ "$SDECFG_RETRY_BROKEN" -eq 1 -o $y -le "$SDECFG_ABORT_ON_ERROR_AFTER" ]; then
+			if [ "$SDECFG_RETRY_BROKEN" -eq 1 -o $y -le "$SDECFG_CONTINUE_ON_ERROR_AFTER" ]; then
 				for x in ${build_root}/var/adm/logs/$y-*.err ; do
 					if [ -f $x ]; then
 						echo_status "Removing ${x#$build_root/} ..."
@@ -209,7 +209,7 @@ pkgloop_package() {
 
 	# Execute action handler
 	if ! pkgloop_action && \
-	   [ $stagelevel -le "$SDECFG_ABORT_ON_ERROR_AFTER" ] ; then
+	   [ $stagelevel -le "$SDECFG_CONTINUE_ON_ERROR_AFTER" ] ; then
 		exit 1
 	fi
 
diff --git a/scripts/Emerge-Pkg b/scripts/Emerge-Pkg
index 74d1e31..5d70a12 100755
--- a/scripts/Emerge-Pkg
+++ b/scripts/Emerge-Pkg
@@ -237,8 +237,8 @@ echo "Packages scheduled to build: ${deplist:-none}"
 for package in $deplist ; do
 	if ./bin/sde-download $package ; then [ $downloadonly != 1 ] && \
 		if ! ./scripts/Build-Pkg $options $package; then
-			if [ $SDECFG_ABORT_ON_ERROR_AFTER -gt 8 ]; then
-				echo "Aborting further builds due to config setting ABORT_ON_ERROR_AFTER."
+			if [ $SDECFG_CONTINUE_ON_ERROR_AFTER -gt 8 ]; then
+				echo "Aborting further builds, check SDECFG_CONTINUE_ON_ERROR_AFTER."
 				exit 1
 			fi
 		fi