public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/resolver/
Date: Mon,  4 Oct 2021 00:24:37 +0000 (UTC)	[thread overview]
Message-ID: <1633307071.9c5689bc065080ec665ee5250d20146cadf760d6.sam@gentoo> (raw)

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	other threads:[~2021-10-04  0:24 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-04  0:24 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-12-06 16:18 [gentoo-commits] proj/portage:master commit in: lib/_emerge/resolver/ Zac Medico
2022-03-27 23:07 Sam James
2021-10-04  0:24 Sam James
2021-08-15  6:48 Michał Górny
2020-08-03 23:28 Zac Medico
2020-08-03 21:42 Zac Medico
2020-08-03 19:30 Zac Medico
2020-08-03  3:08 Zac Medico
2019-01-20  7:24 Zac Medico

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1633307071.9c5689bc065080ec665ee5250d20146cadf760d6.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox