summaryrefslogtreecommitdiffstats
path: root/pym/_emerge
diff options
context:
space:
mode:
authorSebastian Luther <SebastianLuther@gmx.de>2011-04-27 13:36:15 -0700
committerZac Medico <zmedico@gentoo.org>2011-04-27 13:36:15 -0700
commit9e813764e3056fe9a376af70d9bc80749980fe5e (patch)
tree9935d7f722682135733b983789b3aa16bdc461ed /pym/_emerge
parent37b0564dc8013f4495be59eb6af8dc9535c7c695 (diff)
downloadportage-9e813764e3056fe9a376af70d9bc80749980fe5e.tar.gz
portage-9e813764e3056fe9a376af70d9bc80749980fe5e.tar.bz2
portage-9e813764e3056fe9a376af70d9bc80749980fe5e.zip
--autounmask: Don't change masked/forced flags
This will fix bug #364701.
Diffstat (limited to 'pym/_emerge')
-rw-r--r--pym/_emerge/depgraph.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 391c845de..a0a4622ee 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -3120,6 +3120,10 @@ class depgraph(object):
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)
backtrack_infos = self._dynamic_config._backtrack_infos
backtrack_infos.setdefault("config", {})