diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-07 23:38:07 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-07 23:38:07 +0000 |
| commit | 490d2f4e478c922d9cbd3dafc2e84f795446d745 (patch) | |
| tree | 401ea55422f128da4cb1dcdf78bc244d73820727 /pym | |
| parent | d8cbd2f92c83461e37d20b3416c54beb1b5c985f (diff) | |
| download | portage-490d2f4e478c922d9cbd3dafc2e84f795446d745.tar.gz portage-490d2f4e478c922d9cbd3dafc2e84f795446d745.tar.bz2 portage-490d2f4e478c922d9cbd3dafc2e84f795446d745.zip | |
Ignore InvalidDependString exceptions from the RESTRICT of "nomerge" nodes.
svn path=/main/trunk/; revision=6751
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/emerge/__init__.py | 11 |
1 files 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") |