From: Marius Mauch <genone@gentoo.org>
Date: Mon, 22 Sep 2008 11:14:46 +0000 (-0000)
Subject: don't attempt to unmerge a set that doesn't exist anymore
X-Git-Tag: v2.2_rc10~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e5f02cae1050f45c24ed6370ec8365b2ba8e69c4;p=portage.git

don't attempt to unmerge a set that doesn't exist anymore

svn path=/main/trunk/; revision=11533
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index b0d675594..ac4d48f8c 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -10539,6 +10539,8 @@ def unmerge(root_config, myopts, unmerge_action,
 		stop = True
 		pos = len(installed_sets)
 		for s in installed_sets[pos - 1:]:
+			if s not in sets:
+				continue
 			candidates = [x[len(SETPREFIX):] for x in sets[s].getNonAtoms() if x.startswith(SETPREFIX)]
 			if candidates:
 				stop = False