diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2011-09-19 07:32:08 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-09-19 07:32:08 -0700 |
| commit | d36be695ea48025ba195deb82f51846aee2254ec (patch) | |
| tree | eda736004b7c05c5c909e7b7237689bfdf54e08a /pym/_emerge/depgraph.py | |
| parent | 7e956a6ec65b9b48a9fca3e928e7c7b56fd066b6 (diff) | |
| download | portage-d36be695ea48025ba195deb82f51846aee2254ec.tar.gz portage-d36be695ea48025ba195deb82f51846aee2254ec.tar.bz2 portage-d36be695ea48025ba195deb82f51846aee2254ec.zip | |
autounmask: Add --autounmask-keep-masks option
Disables creation of p.unmask entries to allow users
to insist on their masks and hope for another conflict
resolution (i.e. missed update). This fixes bug 372485.
Diffstat (limited to 'pym/_emerge/depgraph.py')
| -rw-r--r-- | pym/_emerge/depgraph.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index a5015b8e6..52d454555 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -3411,6 +3411,8 @@ class depgraph(object): default_selection = (pkg, existing) + autounmask_keep_masks = self._frozen_config.myopts.get("--autounmask-keep-masks", "n") != "n" + if self._dynamic_config._autounmask is True: if pkg is not None and \ pkg.installed and \ @@ -3422,7 +3424,7 @@ class depgraph(object): break for allow_unmasks in (False, True): - if only_use_changes and allow_unmasks: + if allow_unmasks and (only_use_changes or autounmask_keep_masks): continue if pkg is not None: |