commit: b96d1cd7c30d1bb8eebc47cdd5dda36fcbe10c4e Author: Kerin Millar <kfm <AT> plushkava <DOT> net> AuthorDate: Wed Jun 4 19:10:12 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jun 4 19:57:06 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b96d1cd7
estrip: reduce the length of the warnings issued by ewarn Ensure that the horizontal length of all warnings exceeds no more than 80 characters in length. The fact that 3 characters are lost to ewarn has been taken into account. Reduce the vertical length of a few warnings by having them span no more than one line. Consider the following warning as a case in point. * FEATURES=installsources is enabled but the debugedit binary could not be * found. This feature will not work unless debugedit is installed! This warning has been changed to: * FEATURES=installsources requires the debugedit binary, which was not found! I submit that the new message conveys the same information perfectly adequately, and that it is neither more difficult to read, nor more difficult to fathom. On the contrary, I would say that it renders the warning more cogent, especially where multiple warnings are being displayed in succession (compounded further by instructing portage to install multiple packages in a single pass). Bug: https://bugs.gentoo.org/832138 Signed-off-by: Kerin Millar <kfm <AT> plushkava.net> Signed-off-by: Sam James <sam <AT> gentoo.org> bin/estrip | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/bin/estrip b/bin/estrip index a659a90666..af497682af 100755 --- a/bin/estrip +++ b/bin/estrip @@ -245,8 +245,7 @@ save_elf_sources() { return elif ! hash "${name_of[debugedit]}" 2>/dev/null; then stash_warning <<-'EOF' - FEATURES=installsources is enabled but the debugedit binary could not be - found. This feature will not work unless debugedit is installed! + FEATURES=installsources requires the debugedit binary, which was not found! EOF save_elf_sources() { :; } return @@ -290,8 +289,7 @@ dedup_elf_debug() { elif ! hash "${name_of[dwz]}" 2>/dev/null; then # Write out a warning to a function-scoped log file, atomically. stash_warning <<-'EOF' - FEATURES=dedupdebug is enabled but the dwz binary could not be - found. This feature will not work unless dwz is installed! + FEATURES=dedupdebug requires the dwz binary, which was not found! EOF dedup_elf_debug() { :; } return @@ -379,8 +377,8 @@ save_elf_debug() { elif ! contains_word buildid "${warned_for[debugedit]}"; then warned_for[debugedit]+=" buildid" stash_warning <<-'EOF' - FEATURES=splitdebug is enabled but the debugedit binary could not be found - This feature will not work correctly with build IDs unless debugedit is installed! + FEATURES=splitdebug requires the debugedit binary, which was not found! + This feature won't work properly with build IDs until debugedit is installed. EOF fi fi
