| 1 |
commit: 9c5689bc065080ec665ee5250d20146cadf760d6 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 1 05:48:16 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 4 00:24:31 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9c5689bc |
| 7 |
|
| 8 |
lib/_emerge/resolver/output.py: say 'soft blocking' explicitly |
| 9 |
|
| 10 |
Before: |
| 11 |
``` |
| 12 |
[blocks b ] >perl-core/Scalar-List-Utils-1.550.0-r999 (">perl-core/Scalar-List-Utils-1.550.0-r999" is blocking virtual/perl-Scalar-List-Utils-1.550.0) |
| 13 |
|
| 14 |
``` |
| 15 |
|
| 16 |
After: |
| 17 |
``` |
| 18 |
[blocks b ] >perl-core/Scalar-List-Utils-1.550.0-r999 (">perl-core/Scalar-List-Utils-1.550.0-r999" is soft blocking virtual/perl-Scalar-List-Utils-1.550.0) |
| 19 |
|
| 20 |
``` |
| 21 |
|
| 22 |
This should make it a little bit clearer when a block matters, |
| 23 |
especially given we already explicitly say 'hard blocking' |
| 24 |
for the opposite case. |
| 25 |
|
| 26 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 27 |
|
| 28 |
lib/_emerge/resolver/output.py | 2 +- |
| 29 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 30 |
|
| 31 |
diff --git a/lib/_emerge/resolver/output.py b/lib/_emerge/resolver/output.py |
| 32 |
index e891d84c0..7b5602a78 100644 |
| 33 |
--- a/lib/_emerge/resolver/output.py |
| 34 |
+++ b/lib/_emerge/resolver/output.py |
| 35 |
@@ -108,7 +108,7 @@ class Display: |
| 36 |
if blocker.atom.blocker.overlap.forbid: |
| 37 |
blocking_desc = "hard blocking" |
| 38 |
else: |
| 39 |
- blocking_desc = "blocking" |
| 40 |
+ blocking_desc = "soft blocking" |
| 41 |
if self.resolved != blocker.atom: |
| 42 |
addl += colorize( |
| 43 |
self.blocker_style, |
Archives