From 490d2f4e478c922d9cbd3dafc2e84f795446d745 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 7 Jun 2007 23:38:07 +0000 Subject: Ignore InvalidDependString exceptions from the RESTRICT of "nomerge" nodes. svn path=/main/trunk/; revision=6751 --- pym/emerge/__init__.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index f76924723..3217382e8 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -2490,6 +2490,7 @@ class depgraph: blockers.append(addl) else: mydbapi = self.trees[myroot][self.pkg_tree_map[pkg_type]].dbapi + pkg_status = x[3] binary_package = True if "ebuild" == pkg_type: if "merge" == x[3] or \ @@ -2515,10 +2516,12 @@ class depgraph: mydbapi.aux_get(pkg_key, ["RESTRICT"])[0]), uselist=self.useFlags[myroot][pkg_key])) except portage.exception.InvalidDependString, e: - restrict = mydbapi.aux_get(pkg_key, ["RESTRICT"])[0] - show_invalid_depstring_notice(x, restrict, str(e)) - del e - sys.exit(1) + if pkg_status != "nomerge": + restrict = mydbapi.aux_get(pkg_key, ["RESTRICT"])[0] + show_invalid_depstring_notice(x, restrict, str(e)) + del e + sys.exit(1) + restrict = [] if "ebuild" == pkg_type and x[3] != "nomerge" and \ "fetch" in restrict: fetch = red("F") -- cgit v1.2.3-1-g7c22