diff options
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/bin/emerge b/bin/emerge index cec8977f2..27a48ee2c 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2177,18 +2177,28 @@ class depgraph: else: #world mode worldlist = getlist(self.settings, "world") - sysdict = genericdict(getlist(self.settings, "system")) + mylist = getlist(self.settings, "system") worlddict=genericdict(worldlist) for x in worlddict.keys(): if not portage.isvalidatom(x): world_problems = True - elif not self.trees[self.target_root]["vartree"].dbapi.match(x): - world_problems = True - else: - sysdict[x]=worlddict[x] - - mylist = sysdict.keys() + continue + elif not vardb.match(x): + available = False + if "--usepkgonly" not in self.myopts and \ + portdb.match(x): + available = True + elif "--usepkg" in self.myopts: + mymatches = bindb.match(x) + if "--usepkgonly" not in self.myopts: + mymatches = visible(mymatches) + if mymatches: + available = True + if not available: + world_problems = True + continue + mylist.append(x) newlist = [] for atom in mylist: |