[gentoo-portage-dev] [PATCH] Add --autounmask-write-retry feature.

[Wade Cline]

This patch allows users to re-attempt an emerge after USE flag changes
have been automatically written via --autounmask-write, allowing easier
installation of ebuilds when users are not concerned about USE flag
details. Previously, users would have needed to invoke emerge multiple
times.

Implementation was choosen based off of what was possible for me to get
working at the time. Based on Portage 2.2.10_p25_p484922.
---
 man/emerge.1             |  4 +++
 pym/_emerge/depgraph.py  |  5 +++-
 pym/_emerge/main.py      | 66 ++++++++++++++++++++++++++++++------------------
 pym/portage/exception.py |  3 +++
 4 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/man/emerge.1 b/man/emerge.1
index abb0ed8..d921c4c 100644
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -355,6 +355,10 @@ it, if it is a directory, changes are written to the lexicographically
 last file. This way it is always ensured that the new changes take
 precedence over existing changes.
 .TP
+.BR "\-\-autounmask\-write\-retry [ y | n ]"
+If \fB\-\-autounmask\-write\fR is enabled and changes are written
+successfully then \fBemerge\fR will re\-attempt the action.
+.TP
 .BR \-\-backtrack=COUNT
 Specifies an integer number of times to backtrack if
 dependency calculation fails due to a conflict or an
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 28d4026..8864e88 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -28,7 +28,7 @@ from portage.dep._slot_operator import ignore_built_slot_operator_deps
 from portage.eapi import eapi_has_strong_blocks, eapi_has_required_use, \
 	_get_eapi_attrs
 from portage.exception import (InvalidAtom, InvalidData, InvalidDependString,
-	PackageNotFound, PortageException)
+	PackageNotFound, PortageException, RetryEmerge)
 from portage.output import colorize, create_color_func, \
 	darkgreen, green
 bad = create_color_func("BAD")
@@ -7300,6 +7300,7 @@ class depgraph(object):
 		"""
 
 		autounmask_write = self._frozen_config.myopts.get("--autounmask-write", "n") == True
+		autounmask_write_retry = self._frozen_config.myopts.get("--autounmask-write-retry", "n") == True
 		autounmask_unrestricted_atoms = \
 			self._frozen_config.myopts.get("--autounmask-unrestricted-atoms", "n") == True
 		quiet = "--quiet" in self._frozen_config.myopts
@@ -7660,6 +7661,8 @@ class depgraph(object):
 			for root in roots:
 				chk_updated_cfg_files(root,
 					[os.path.join(os.sep, USER_CONFIG_PATH)])
+			if autounmask_write_retry:
+				raise RetryEmerge("Re-try emerge")
 		elif not pretend and not autounmask_write and roots:
 			writemsg("\nUse --autounmask-write to write changes to config files (honoring\n"
 				"CONFIG_PROTECT). Carefully examine the list of proposed changes,\n"
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index eddb16c..b033f7b 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -19,6 +19,7 @@ portage.proxy.lazyimport.lazyimport(globals(),
 	'_emerge.is_valid_package_atom:insert_category_into_atom'
 )
 from portage import os
+from portage.exception import RetryEmerge
 from portage.util._argparse import ArgumentParser
 
 if sys.hexversion >= 0x3000000:
@@ -129,6 +130,7 @@ def insert_optional_args(args):
 		'--autounmask-keep-masks': y_or_n,
 		'--autounmask-unrestricted-atoms' : y_or_n,
 		'--autounmask-write'     : y_or_n,
+		'--autounmask-write-retry' : y_or_n,
 		'--buildpkg'             : y_or_n,
 		'--complete-graph'       : y_or_n,
 		'--deep'       : valid_integers,
@@ -326,6 +328,11 @@ def parse_opts(tmpcmdline, silent=False):
 			"choices" : true_y_or_n
 		},
 
+		"--autounmask-write-retry": {
+			"help"    : "retry emerge after writing unmask changes",
+			"choices" : true_y_or_n
+		},
+
 		"--accept-properties": {
 			"help":"temporarily override ACCEPT_PROPERTIES",
 			"action":"store"
@@ -691,6 +698,10 @@ def parse_opts(tmpcmdline, silent=False):
 
 	if myoptions.autounmask_write in true_y:
 		myoptions.autounmask_write = True
+		if myoptions.autounmask_write_retry in true_y:
+			myoptions.autounmask_write_retry = True
+	elif myoptions.autounmask_write_retry in true_y:
+		parser.error("--autounmask-write must be set if -autounmask-write-retry is specified")
 
 	if myoptions.buildpkg in true_y:
 		myoptions.buildpkg = True
@@ -1020,28 +1031,33 @@ def emerge_main(args=None):
 
 	# Portage needs to ensure a sane umask for the files it creates.
 	os.umask(0o22)
-	if myaction == "sync":
-		portage._sync_mode = True
-	emerge_config = load_emerge_config(
-		action=myaction, args=myfiles, opts=myopts)
-	rval = profile_check(emerge_config.trees, emerge_config.action)
-	if rval != os.EX_OK:
-		return rval
-
-	tmpcmdline = []
-	if "--ignore-default-opts" not in myopts:
-		tmpcmdline.extend(portage.util.shlex_split(
-			emerge_config.target_config.settings.get(
-			"EMERGE_DEFAULT_OPTS", "")))
-	tmpcmdline.extend(args)
-	emerge_config.action, emerge_config.opts, emerge_config.args = \
-		parse_opts(tmpcmdline)
-
-	try:
-		return run_action(emerge_config)
-	finally:
-		# Call destructors for our portdbapi instances.
-		for x in emerge_config.trees.values():
-			if "porttree" in x.lazy_items:
-				continue
-			x["porttree"].dbapi.close_caches()
+	while 1:
+		if myaction == "sync":
+			portage._sync_mode = True
+		emerge_config = load_emerge_config(
+			action=myaction, args=myfiles, opts=myopts)
+		rval = profile_check(emerge_config.trees, emerge_config.action)
+		if rval != os.EX_OK:
+			return rval
+
+		tmpcmdline = []
+		if "--ignore-default-opts" not in myopts:
+			tmpcmdline.extend(portage.util.shlex_split(
+				emerge_config.target_config.settings.get(
+				"EMERGE_DEFAULT_OPTS", "")))
+		tmpcmdline.extend(args)
+		emerge_config.action, emerge_config.opts, emerge_config.args = \
+			parse_opts(tmpcmdline)
+
+		try:
+			status = run_action(emerge_config)
+			break
+		except RetryEmerge:
+			continue
+		finally:
+			# Call destructors for our portdbapi instances.
+			for x in emerge_config.trees.values():
+				if "porttree" in x.lazy_items:
+					continue
+				x["porttree"].dbapi.close_caches()
+	return status
diff --git a/pym/portage/exception.py b/pym/portage/exception.py
index 6fa5447..7b3b4f4 100644
--- a/pym/portage/exception.py
+++ b/pym/portage/exception.py
@@ -75,6 +75,9 @@ class InvalidData(PortageException):
 class InvalidDataType(PortageException):
 	"""An incorrect type was passed instead of the expected one"""
 
+class RetryEmerge(PortageException):
+	"""Re-try the emerge request"""
+
 class InvalidLocation(PortageException):
 	"""Data was not found when it was expected to exist or was specified incorrectly"""
 
-- 
1.8.5.5