This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
commit c97cd956ed6f0dc69f72915d2f7dc7303fff0d88 Author: Guillem Jover <[email protected]> Date: Tue Feb 17 03:41:05 2015 +0100 dpkg-scanpackages: Merge the same warning messages into a single line --- debian/changelog | 1 + scripts/dpkg-scanpackages.pl | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9efb1bd..d1f1c33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -88,6 +88,7 @@ dpkg (1.18.0) UNRELEASED; urgency=low - Expand EOF and eof into “end of file” in error messages. - Use “<enter>” instead of “return” or “enter” in input prompts. - Say directory instead of dir in output messages. + - Merge the same dpkg-scanpackages warning messages into a single line. [ Raphaël Hertzog ] * Drop myself from Uploaders. diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl index 8313268..51deb4f 100755 --- a/scripts/dpkg-scanpackages.pl +++ b/scripts/dpkg-scanpackages.pl @@ -2,7 +2,7 @@ # # dpkg-scanpackages # -# Copyright © 2006-2012 Guillem Jover <[email protected]> +# Copyright © 2006-2015 Guillem Jover <[email protected]> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -222,15 +222,14 @@ FILE: if (version_compare_relation($fields->{'Version'}, REL_GT, $pkg->{'Version'})) { - warning(g_('package %s (filename %s) is repeat but newer version;'), - $p, $fn); - warning(g_('used that one and ignored data from %s!'), - $pkg->{Filename}); + warning(g_('package %s (filename %s) is repeat but newer ' . + 'version; used that one and ignored data from %s!'), + $p, $fn, $pkg->{Filename}); $packages{$p} = []; } else { - warning(g_('package %s (filename %s) is repeat;'), $p, $fn); - warning(g_('ignored that one and using data from %s!'), - $pkg->{Filename}); + warning(g_('package %s (filename %s) is repeat; ' . + 'ignored that one and using data from %s!'), + $p, $fn, $pkg->{Filename}); next FILE; } } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/dpkg/dpkg.git -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
