diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-06 07:26:26 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-06 07:26:26 +0000 |
| commit | 86698050dfcd6023f906bfbc84e0a988c8afffbd (patch) | |
| tree | 9000f10008f27c7f5a458b23955257a57c26751d /bin/emerge | |
| parent | d6ba2af2b47c6d92543ecac00e88c4c4c75601f2 (diff) | |
| download | portage-86698050dfcd6023f906bfbc84e0a988c8afffbd.tar.gz portage-86698050dfcd6023f906bfbc84e0a988c8afffbd.tar.bz2 portage-86698050dfcd6023f906bfbc84e0a988c8afffbd.zip | |
Remove the installed package masking hack from bug #149816 since
installed packages should be able to satisfy dependencies whether
they are masked or not (matches current trunk behavior).
svn path=/main/branches/2.1.2/; revision=8441
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/bin/emerge b/bin/emerge index 2c79af69e..947096388 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1960,11 +1960,6 @@ class depgraph: last resort because the metadata tends to diverge from that of the ebuild in the tree.""" myeb_inst_matches = vardb.match(x) - if "--usepkgonly" not in self.myopts: - """ TODO: Improve masking check for installed and - binary packages. bug #149816""" - myeb_inst_matches = [pkg for pkg in myeb_inst_matches \ - if not portdb.cpv_exists(pkg)] myeb_inst = None if myeb_inst_matches: myeb_inst = portage.best(myeb_inst_matches) |