From f3fd010e6e6193324f298623a7b133eb495b179b Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 21 Aug 2009 22:04:51 +0000
Subject: Add support for --keep-going=n so that it can be disabled on the
 command line after it's been enabled in EMERGE_DEFAULT_OPTS.

svn path=/main/trunk/; revision=14121
---
 pym/_emerge/help.py |  2 +-
 pym/_emerge/main.py | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'pym')

diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index cbd1fe491..18e4369b6 100644
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -360,7 +360,7 @@ def help(myopts, havecolor=1):
 		for line in wrap(desc, desc_width):
 			print desc_indent + line
 		print
-		print "       "+green("--keep-going")
+		print "       " + green("--keep-going") + "[=%s]" % turquoise("n")
 		desc = "Continue as much as possible after " + \
 			"an error. When an error occurs, " + \
 			"dependencies are recalculated for " + \
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index c5a16ff42..9115a25d6 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -45,7 +45,6 @@ options=[
 "--emptytree",
 "--fetchonly",    "--fetch-all-uri",
 "--ignore-default-opts",
-"--keep-going",
 "--noconfmem",
 "--newuse",
 "--nodeps",       "--noreplace",
@@ -376,6 +375,7 @@ def insert_optional_args(args):
 		'--getbinpkg'            : ('n',),
 		'--getbinpkgonly'        : ('n',),
 		'--jobs'       : valid_integers,
+		'--keep-going'           : ('n',),
 		'--root-deps'  : ('rdeps',),
 		'--selective'            : ('n',),
 		'--usepkg'               : ('n',),
@@ -533,6 +533,12 @@ def parse_opts(tmpcmdline, silent=False):
 			"action" : "store"
 		},
 
+		"--keep-going": {
+			"help"    : "continue as much as possible after an error",
+			"type"    : "choice",
+			"choices" : ("True", "n")
+		},
+
 		"--load-average": {
 
 			"help"   :"Specifies that no new builds should be started " + \
@@ -661,6 +667,11 @@ def parse_opts(tmpcmdline, silent=False):
 	else:
 		myoptions.getbinpkgonly = None
 
+	if myoptions.keep_going in ("True",):
+		myoptions.keep_going = True
+	else:
+		myoptions.keep_going = None
+
 	if myoptions.root_deps == "True":
 		myoptions.root_deps = True
 
-- 
cgit v1.2.3-1-g7c22