From a6c6eadd2c96dc1d442baee06508a7bcf11f13d2 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 1 Oct 2010 07:18:19 -0700
Subject: Bug #339316 - Fix --resume to handle repo masks.

---
 pym/_emerge/depgraph.py | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'pym')

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 857e6df20..a533a86b8 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5014,14 +5014,28 @@ class depgraph(object):
 					repo = atom.repo
 					break
 
+			atom = "=" + pkg_key
+			if repo:
+				atom = atom + _repo_separator + repo
+
 			try:
-				pkg = self._pkg(pkg_key, pkg_type, root_config, myrepo=repo)
-			except portage.exception.PackageNotFound:
+				atom = Atom(atom, allow_repo=True)
+			except InvalidAtom:
+				continue
+
+			pkg = None
+			for pkg in self._iter_match_pkgs(root_config, pkg_type, atom):
+				if not pkg.visible or \
+					self._frozen_config.excluded_pkgs.findAtomForPackage(pkg,
+						modified_use=self._pkg_use_enabled(pkg)):
+					continue
+
+			if pkg is None:
 				# It does no exist or it is corrupt.
 				if skip_missing:
 					# TODO: log these somewhere
 					continue
-				raise
+				raise portage.exception.PackageNotFound(pkg_key)
 
 			if "merge" == pkg.operation and \
 				self._frozen_config.excluded_pkgs.findAtomForPackage(pkg, \
-- 
cgit v1.2.3-1-g7c22