Ignore InvalidDependString exceptions from the RESTRICT of nomerge nodes. (trunk...

svn path=/main/branches/2.1.2/; revision=6765

diff --git a/bin/emerge b/bin/emerge
index ddac9edff1dbac86f45cd1c39f31dd2bea9c7e78..dee541b7219aa297d52cb9e2f4315f6790f76ec1 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2458,6 +2458,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 \
@@ -2483,10 +2484,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")