diff options
| author |   Sam James <sam@gentoo.org> | 2021-10-01 06:48:16 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-10-04 01:24:31 +0100 |
| commit | 9c5689bc065080ec665ee5250d20146cadf760d6 (patch) | |
| tree | 3d82a354bda591cffd73b19ee00301220155a005 | |
| parent | prepare_build_dirs: handle copytree FileExistsError (diff) | |
| download | portage-9c5689bc065080ec665ee5250d20146cadf760d6.tar.gz portage-9c5689bc065080ec665ee5250d20146cadf760d6.tar.bz2 portage-9c5689bc065080ec665ee5250d20146cadf760d6.zip | |
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@gentoo.org>
| -rw-r--r-- | lib/_emerge/resolver/output.py | 2 |
1 files changed, 1 insertions, 1 deletions
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, |