From: Zac Medico Date: Sat, 15 May 2010 21:00:47 +0000 (-0700) Subject: Fix --resume to support --exclude. X-Git-Tag: v2.2_rc68~599 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=229b7b55ab42147021a6084d2f097d1d79c70fcd;p=portage.git Fix --resume to support --exclude. --- diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index bbe1a98c9..9687ef527 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5133,6 +5133,10 @@ class depgraph(object): continue raise + if "merge" == pkg.operation and \ + self._frozen_config.excluded_pkgs.findAtomForPackage(pkg): + continue + if "merge" == pkg.operation and not pkg.visible: if skip_masked: masked_tasks.append(Dependency(root=pkg.root, parent=pkg))