diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-08 20:14:57 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-08 20:14:57 +0000 |
| commit | c81076e45d560dedb5f162ba09207bc4db32a541 (patch) | |
| tree | 2edd1a075dd80330b13390089bd7ed610e07ad67 /bin/emerge | |
| parent | 0056ce78d4c0a3a07352c85aedc3739ad6f37121 (diff) | |
| download | portage-c81076e45d560dedb5f162ba09207bc4db32a541.tar.gz portage-c81076e45d560dedb5f162ba09207bc4db32a541.tar.bz2 portage-c81076e45d560dedb5f162ba09207bc4db32a541.zip | |
Ignore InvalidDependString exceptions from the RESTRICT of nomerge nodes. (trunk r6751)
svn path=/main/branches/2.1.2/; revision=6765
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/bin/emerge b/bin/emerge index ddac9edff..dee541b72 100755 --- 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") |