diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-10-17 09:40:05 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-10-17 09:40:05 +0000 |
| commit | 64948b131b2e2d553d0d666c68d7e48276d2c3e4 (patch) | |
| tree | 486c9d534d6e41d1c0a07a8327eff5b8bd127989 /bin | |
| parent | c2a9bb3d06d32472d4bbadc15a397c5746645372 (diff) | |
| download | portage-64948b131b2e2d553d0d666c68d7e48276d2c3e4.tar.gz portage-64948b131b2e2d553d0d666c68d7e48276d2c3e4.tar.bz2 portage-64948b131b2e2d553d0d666c68d7e48276d2c3e4.zip | |
Stack use.mask/package.use.mask together at each level of the profile for bug #151586, and do the same with use.force/package.use.force.
svn path=/main/trunk/; revision=4735
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/bin/emerge b/bin/emerge index 44e059a3c..cea492baf 100755 --- a/bin/emerge +++ b/bin/emerge @@ -771,9 +771,7 @@ class depgraph: pkgsettings.setcpv(mykey, mydb=portdb) forced_flags = set() forced_flags.update(pkgsettings.useforce) - forced_flags.update(pkgsettings.puseforce) forced_flags.update(pkgsettings.usemask) - forced_flags.update(pkgsettings.pusemask) old_use = vardbapi.aux_get(mykey, ["USE"])[0].split() iuses = set(filter_iuse_defaults( mydbapi.aux_get(mykey, ["IUSE"])[0].split())) @@ -1181,9 +1179,7 @@ class depgraph: now_use = pkgsettings["USE"].split() forced_flags = set() forced_flags.update(pkgsettings.useforce) - forced_flags.update(pkgsettings.puseforce) forced_flags.update(pkgsettings.usemask) - forced_flags.update(pkgsettings.pusemask) cur_iuse = iuses if "--usepkgonly" not in self.myopts and myeb: cur_iuse = set(filter_iuse_defaults( @@ -1797,9 +1793,7 @@ class depgraph: forced_flags = set() if not binary_package: forced_flags.update(pkgsettings.useforce) - forced_flags.update(pkgsettings.puseforce) forced_flags.update(pkgsettings.usemask) - forced_flags.update(pkgsettings.pusemask) cur_iuse = portage.unique_array(cur_iuse) cur_iuse.sort() |