commit:     9c5689bc065080ec665ee5250d20146cadf760d6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  1 05:48:16 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct  4 00:24:31 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=9c5689bc

lib/_emerge/resolver/output.py: say 'soft blocking' explicitly

Before:
```
[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)

```

After:
```
[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)

```

This should make it a little bit clearer when a block matters,
especially given we already explicitly say 'hard blocking'
for the opposite case.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 lib/_emerge/resolver/output.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/_emerge/resolver/output.py b/lib/_emerge/resolver/output.py
index e891d84c0..7b5602a78 100644
--- a/lib/_emerge/resolver/output.py
+++ b/lib/_emerge/resolver/output.py
@@ -108,7 +108,7 @@ class Display:
         if blocker.atom.blocker.overlap.forbid:
             blocking_desc = "hard blocking"
         else:
-            blocking_desc = "blocking"
+            blocking_desc = "soft blocking"
         if self.resolved != blocker.atom:
             addl += colorize(
                 self.blocker_style,

Reply via email to