Gentoo Archives: gentoo-portage-dev

From: Sam James <sam@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Sam James <sam@g.o>
Subject: [gentoo-portage-dev] [PATCH 1/2] lib/_emerge/resolver/output.py: say 'soft blocking' explicitly
Date: Sat, 02 Oct 2021 20:12:06
Message-Id: 20211002201156.346719-1-sam@gentoo.org
1 Before:
2 ```
3 [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)
4
5 ```
6
7 After:
8 ```
9 [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)
10
11 ```
12
13 This should make it a little bit clearer when a block matters,
14 especially given we already explicitly say 'hard blocking'
15 for the opposite case.
16
17 Signed-off-by: Sam James <sam@g.o>
18 ---
19 lib/_emerge/resolver/output.py | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22 diff --git a/lib/_emerge/resolver/output.py b/lib/_emerge/resolver/output.py
23 index e891d84c0..7b5602a78 100644
24 --- a/lib/_emerge/resolver/output.py
25 +++ b/lib/_emerge/resolver/output.py
26 @@ -108,7 +108,7 @@ class Display:
27 if blocker.atom.blocker.overlap.forbid:
28 blocking_desc = "hard blocking"
29 else:
30 - blocking_desc = "blocking"
31 + blocking_desc = "soft blocking"
32 if self.resolved != blocker.atom:
33 addl += colorize(
34 self.blocker_style,
35 --
36 2.33.0

Replies