This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=c107aecd663dc142398407636b4936ce15085401 commit c107aecd663dc142398407636b4936ce15085401 Author: Guillem Jover <[email protected]> AuthorDate: Fri Dec 13 00:23:02 2024 +0100 scripts: Switch messages to be hints This makes the function calls provide a unified output, and will make it possible to disable hints, if the users does not want to see them. --- scripts/Dpkg/Source/Package/V2.pm | 4 ++-- scripts/dpkg-buildpackage.pl | 2 +- scripts/dpkg-shlibdeps.pl | 11 ++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm index a3d6c49a9..26617e6d4 100644 --- a/scripts/Dpkg/Source/Package/V2.pm +++ b/scripts/Dpkg/Source/Package/V2.pm @@ -570,9 +570,9 @@ sub do_build { skip_auto => $self->{options}{auto_commit}, usage => 'build'); unless (-z $tmpdiff or $self->{options}{auto_commit}) { - info(g_('Hint: make sure the version in debian/changelog matches ' . + hint(g_('make sure the version in debian/changelog matches ' . 'the unpacked source tree')); - info(g_('you can integrate the local changes with %s'), + hint(g_('you can integrate the local changes with %s'), 'dpkg-source --commit'); error(g_('aborting due to unexpected upstream changes, see %s'), $tmpdiff); diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl index d849d6e90..df827db42 100755 --- a/scripts/dpkg-buildpackage.pl +++ b/scripts/dpkg-buildpackage.pl @@ -676,7 +676,7 @@ if ($checkbuilddep) { subprocerr('dpkg-checkbuilddeps'); } elsif (WEXITSTATUS($?)) { warning(g_('build dependencies/conflicts unsatisfied; aborting')); - warning(g_('(Use -d flag to override.)')); + hint(g_('use -d flag to override')); exit 3; } } diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl index b46f8fd0d..d07c8be64 100755 --- a/scripts/dpkg-shlibdeps.pl +++ b/scripts/dpkg-shlibdeps.pl @@ -382,11 +382,12 @@ foreach my $file (keys %exec) { $ignore++ unless scalar split_soname($soname); # 3/ when we have been asked to do so $ignore++ if $ignore_missing_info; - error(g_('no dependency information found for %s ' . - "(used by %s)\n" . - 'Hint: check if the library actually comes ' . - 'from a package.'), $lib, $file) - unless $ignore; + if (not $ignore) { + errormsg(g_('no dependency information found for %s (used by %s)'), + $lib, $file); + hint(g_('check if the library actually comes from a package')); + exit 1; + } } } -- Dpkg.Org's dpkg
