From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 8 Jul 2008 10:49:02 +0000 (-0000)
Subject: Fix ValueError triggered when Scheduler._choose_pkg() doesn't find a package
X-Git-Tag: v2.2_rc2~156
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=750abd4c47104148aaebc62fb9332b34109f4399;p=portage.git

Fix ValueError triggered when Scheduler._choose_pkg() doesn't find a package
and returns None.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 66f5ce4ee..d7cd8fa11 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -8101,7 +8101,8 @@ class Scheduler(object):
 				chosen_pkg = pkg
 				break
 
-		self._pkg_queue.remove(chosen_pkg)
+		if chosen_pkg is not None:
+			self._pkg_queue.remove(chosen_pkg)
 		return chosen_pkg
 
 	def _dependent_on_scheduled_merges(self, pkg):