| 1 |
Signed-off-by: Aaron Bauman <bman@g.o> |
| 2 |
--- |
| 3 |
lib/_emerge/resolver/circular_dependency.py | 6 +++--- |
| 4 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 5 |
|
| 6 |
diff --git a/lib/_emerge/resolver/circular_dependency.py b/lib/_emerge/resolver/circular_dependency.py |
| 7 |
index d0c026dad..109f22b9c 100644 |
| 8 |
--- a/lib/_emerge/resolver/circular_dependency.py |
| 9 |
+++ b/lib/_emerge/resolver/circular_dependency.py |
| 10 |
@@ -1,4 +1,4 @@ |
| 11 |
-# Copyright 2010-2013 Gentoo Foundation |
| 12 |
+# Copyright 2010-2020 Gentoo Authors |
| 13 |
# Distributed under the terms of the GNU General Public License v2 |
| 14 |
|
| 15 |
from __future__ import print_function |
| 16 |
@@ -134,10 +134,10 @@ class circular_dependency_handler: |
| 17 |
raise |
| 18 |
affecting_use = set() |
| 19 |
|
| 20 |
- # Make sure we don't want to change a flag that is |
| 21 |
+ # Make sure we don't want to change a flag that is |
| 22 |
# a) in use.mask or use.force |
| 23 |
# b) changed by autounmask |
| 24 |
- |
| 25 |
+ |
| 26 |
usemask, useforce = self._get_use_mask_and_force(parent) |
| 27 |
autounmask_changes = self._get_autounmask_changes(parent) |
| 28 |
untouchable_flags = frozenset(chain(usemask, useforce, autounmask_changes)) |
| 29 |
-- |
| 30 |
2.28.0 |
Archives