diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2011-04-27 13:36:15 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-04 12:32:18 -0700 |
| commit | 6a58b5518697cb979f9c6b0acd9337d3660e316d (patch) | |
| tree | 8e2a8749f548b30d75bad2572044245223dac0a5 /pym/_emerge | |
| parent | a76dd07a2569eb515855ecc6ce3487d39ff8005d (diff) | |
| download | portage-6a58b5518697cb979f9c6b0acd9337d3660e316d.tar.gz portage-6a58b5518697cb979f9c6b0acd9337d3660e316d.tar.bz2 portage-6a58b5518697cb979f9c6b0acd9337d3660e316d.zip | |
--autounmask: Don't change masked/forced flags
This will fix bug #364701.
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/depgraph.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 91ec7599e..fabc2df10 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -3094,7 +3094,11 @@ class depgraph(object): if required_use and check_required_use(required_use, old_use, pkg.iuse.is_valid_flag) and \ not check_required_use(required_use, new_use, pkg.iuse.is_valid_flag): return old_use - + + if pkg.use.mask.intersection(new_changes) or \ + pkg.use.force.intersection(new_changes): + return old_use + self._dynamic_config._needed_use_config_changes[pkg] = (new_use, new_changes) if want_restart_for_use_change(pkg, new_use): self._dynamic_config._need_restart = True |