From 64948b131b2e2d553d0d666c68d7e48276d2c3e4 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 17 Oct 2006 09:40:05 +0000 Subject: 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 --- bin/emerge | 6 ------ 1 file changed, 6 deletions(-) (limited to 'bin') 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() -- cgit v1.2.3-1-g7c22