From d36be695ea48025ba195deb82f51846aee2254ec Mon Sep 17 00:00:00 2001 From: Sebastian Luther Date: Mon, 19 Sep 2011 07:32:08 -0700 Subject: 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. --- pym/_emerge/depgraph.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pym/_emerge/depgraph.py') 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: -- cgit v1.2.3-1-g7c22