This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
commit c6d00a09743e4fa4d531a341f0113c43a2669972 Author: Guillem Jover <[email protected]> Date: Mon Feb 16 23:58:39 2015 +0100 scripts: Uppercase field names in error messages --- debian/changelog | 1 + scripts/Dpkg/Control/Info.pm | 2 +- scripts/Dpkg/Source/Package.pm | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7a08a83..99fef75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -84,6 +84,7 @@ dpkg (1.18.0) UNRELEASED; urgency=low * Output strings fixes and improvements: - Say “execute” instead of “exec” in Dpkg::Changelog::Parse error message. - Say “package” instead of “it” in dpkg-name warning message. + - Uppercase field names in error messages. [ Raphaël Hertzog ] * Drop myself from Uploaders. diff --git a/scripts/Dpkg/Control/Info.pm b/scripts/Dpkg/Control/Info.pm index a656ca6..10c2774 100644 --- a/scripts/Dpkg/Control/Info.pm +++ b/scripts/Dpkg/Control/Info.pm @@ -100,7 +100,7 @@ sub parse { return if not $cdata->parse($fh, $desc); $self->{source} = $cdata; unless (exists $cdata->{Source}) { - $cdata->parse_error($desc, g_('first block lacks a source field')); + $cdata->parse_error($desc, g_('first block lacks a Source field')); } while (1) { $cdata = Dpkg::Control->new(type => CTRL_INFO_PKG); diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm index 2e3440c..9b9e1a3 100644 --- a/scripts/Dpkg/Source/Package.pm +++ b/scripts/Dpkg/Source/Package.pm @@ -337,7 +337,8 @@ sub get_basename { my ($self, $with_revision) = @_; my $f = $self->{fields}; unless (exists $f->{'Source'} and exists $f->{'Version'}) { - error(g_('source and version are required to compute the source basename')); + error(g_('%s and %s fields are required to compute the source basename'), + 'Source', 'Version'); } my $v = Dpkg::Version->new($f->{'Version'}); my $vs = $v->as_string(omit_epoch => 1, omit_revision => !$with_revision); -- 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]
