[gentoo-portage-dev] [PATCH] calc_depclean: adjust early warning messages

[Zac Medico]

Suppress "no system list" warning if @profile is non-empty, in order
to support @profile as an alternative to @system. Suppress "no world
file" warnings unless @world is completely empty, since having an
empty world file can be a valid state. Abort if a PackageSetNotFound
error is encountered, or if @world is completely empty.
---
 pym/_emerge/actions.py | 45 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 01aef51..a397fc2 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -699,30 +699,49 @@ def calc_depclean(settings, trees, ldpath_mtimes,
 	protected_set = InternalPackageSet()
 	protected_set_name = '____depclean_protected_set____'
 	required_sets[protected_set_name] = protected_set
-	system_set = psets["system"]
 
+	set_warning = False
+	set_error = False
 	set_atoms = {}
 	for k in ("profile", "system", "selected"):
 		try:
 			set_atoms[k] = root_config.setconfig.getSetAtoms(k)
-		except portage.exception.PackageSetNotFound:
+		except portage.exception.PackageSetNotFound as e:
 			# A nested set could not be resolved, so ignore nested sets.
 			set_atoms[k] = root_config.sets[k].getAtoms()
+			writemsg_level(_("!!! The set '%s' "
+				"contains a non-existent set named '%s'.\n") %
+				(k, e), level=logging.ERROR, noiselevel=-1)
+			set_error = True
+
+	# Support @profile as an alternative to @system.
+	if not (set_atoms["system"] or set_atoms["profile"]):
+		writemsg_level(_("!!! You have no system list.\n"),
+			level=logging.WARNING, noiselevel=-1)
+		set_warning = True
 
-	if (not set_atoms["system"] or
-		not (set_atoms["selected"] or set_atoms["profile"])):
-
-		if not set_atoms["system"]:
-			writemsg_level("!!! You have no system list.\n",
+	# Suppress world file warnings unless @world is completely empty,
+	# since having an empty world file can be a valid state.
+	try:
+		world_atoms = bool(root_config.setconfig.getSetAtoms('world'))
+	except portage.exception.PackageSetNotFound as e:
+		writemsg_level(_("!!! The set '%s' "
+			"contains a non-existent set named '%s'.\n") %
+			("world", e), level=logging.ERROR, noiselevel=-1)
+		set_error = True
+	else:
+		if not world_atoms:
+			writemsg_level(_("!!! You have no world file.\n"),
 				level=logging.ERROR, noiselevel=-1)
+			set_error = True
 
-		# Skip this warning if @profile is non-empty, in order to
-		# support using @profile as an alternative to @selected
-		# for building a stage 4.
-		if not (set_atoms["selected"] or set_atoms["profile"]):
-			writemsg_level("!!! You have no world file.\n",
-					level=logging.WARNING, noiselevel=-1)
+	if set_error:
+		writemsg_level(_("!!! Aborting due to set configuration "
+			"errors displayed above.\n"),
+			level=logging.ERROR, noiselevel=-1)
+		return 1, [], False, 0
 
+	if set_warning:
 		writemsg_level("!!! Proceeding is likely to " + \
 			"break your installation.\n",
 			level=logging.WARNING, noiselevel=-1)
-- 
2.4.9