[libparse-debianchangelog-perl] 43/52: Don't use "English" just for $.
Intrigeri
intrigeri at moszumanska.debian.org
Sun May 24 12:37:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
intrigeri pushed a commit to branch master
in repository libparse-debianchangelog-perl.
commit de9fffca1831922e70936bc1a4441af32fed296b
Author: Frank Lichtenheld <frank at lichtenheld.de>
Date: Mon Apr 4 17:42:03 2011 +0200
Don't use "English" just for $.
---
Changes | 1 +
lib/Parse/DebianChangelog.pm | 37 ++++++++++++++++++-------------------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/Changes b/Changes
index 626e687..5e6cd4c 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,7 @@ Parse-DebianChangelog (1.2.0) unstable; urgency=low
* DebianChangelog:
- Improve readability of regexes by using named captures
- Don't use $& or $` (Closes: #515018)
+ - Don't use "English" just for $.
* ChangesFilters:
- Fix conversion of <http://something/> (Closes: #603341)
- Allow to omit # before closed bug numbers (Closes: 446798 ;)
diff --git a/lib/Parse/DebianChangelog.pm b/lib/Parse/DebianChangelog.pm
index f0f9404..c4b05af 100644
--- a/lib/Parse/DebianChangelog.pm
+++ b/lib/Parse/DebianChangelog.pm
@@ -97,7 +97,6 @@ use strict;
use warnings;
use Fcntl qw( :flock );
-use English;
use Locale::gettext;
use Date::Parse;
use Parse::DebianChangelog::Util qw( :all );
@@ -165,9 +164,9 @@ sub _do_parse_error {
$file = substr $file, 0, 20;
unless ($self->{config}{quiet}) {
if ($line) {
- warn "WARN: $file(l$NR): $error\nLINE: $line\n";
+ warn "WARN: $file(l$.): $error\nLINE: $line\n";
} else {
- warn "WARN: $file(l$NR): $error\n";
+ warn "WARN: $file(l$.): $error\n";
}
}
}
@@ -316,7 +315,7 @@ sub parse {
if (m/^(?<Source>\w[-+0-9a-z.]*) \((?<Version>[^\(\) \t]+)\)(?<Distribution>(?:\s+[-0-9a-z]+)+)\;\s*(?<kv>.*)$/i) {
unless ($expect eq 'first heading'
|| $expect eq 'next heading or eof') {
- $entry->{ERROR} = [ $file, $NR,
+ $entry->{ERROR} = [ $file, $.,
__g( "found start of entry where expected %s",
$expect ), "$_" ];
$self->_do_parse_error(@{$entry->{ERROR}});
@@ -338,15 +337,15 @@ sub parse {
my %kvdone;
for my $kv (split(/\s*,\s*/,$+{kv})) {
$kv =~ m/^([-0-9a-z]+)\=\s*(.*\S)$/i ||
- $self->_do_parse_error($file, $NR,
+ $self->_do_parse_error($file, $.,
__g( "bad key-value after \`;': \`%s'", $kv ));
my $k = ucfirst $1;
my $v = $2;
- $kvdone{$k}++ && $self->_do_parse_error($file, $NR,
+ $kvdone{$k}++ && $self->_do_parse_error($file, $.,
__g( "repeated key-value %s", $k ));
if ($k eq 'Urgency') {
$v =~ m/^([-0-9a-z]+)((\s+.*)?)$/i ||
- $self->_do_parse_error($file, $NR,
+ $self->_do_parse_error($file, $.,
__g( "badly formatted urgency value" ),
$v);
$entry->{'Urgency'} = "$1";
@@ -357,7 +356,7 @@ sub parse {
# XC for putting in Control, XS for putting in Source
$entry->{$k}= $v;
} else {
- $self->_do_parse_error($file, $NR,
+ $self->_do_parse_error($file, $.,
__g( "unknown key-value key %s - copying to XS-%s", $k, $k ));
$entry->{ExtraFields}{"XS-$k"} = $v;
}
@@ -388,15 +387,15 @@ sub parse {
$self->{oldformat} = "$_\n";
$self->{oldformat} .= join "", <$fh>;
} elsif (m/^\S/) {
- $self->_do_parse_error($file, $NR,
+ $self->_do_parse_error($file, $.,
__g( "badly formatted heading line" ), "$_");
} elsif (m/^ \-\- (?<name>.*) <(?<email>.*)>(?<sep> ?)(?<date>(?:\w+\,\s*)?\d{1,2}\s+\w+\s+\d{4}\s+\d{1,2}:\d\d:\d\d\s+[-+]\d{4}(\s+\([^\\\(\)]\))?)$/o) {
$expect eq 'more change data or trailer' ||
- $self->_do_parse_error($file, $NR,
+ $self->_do_parse_error($file, $.,
__g( "found trailer where expected %s",
$expect ), "$_");
if ($+{sep} ne ' ') {
- $self->_do_parse_error($file, $NR,
+ $self->_do_parse_error($file, $.,
__g( "badly formatted trailer line" ),
"$_");
}
@@ -406,14 +405,14 @@ sub parse {
$entry->{'Date'} = "$+{date}";
$entry->{'Timestamp'} = str2time($+{date});
unless (defined $entry->{'Timestamp'}) {
- $self->_do_parse_error( $file, $NR,
+ $self->_do_parse_error( $file, $.,
__g( "couldn't parse date %s",
"$+{date}" ) );
}
}
$expect = 'next heading or eof';
} elsif (m/^ \-\-/) {
- $entry->{ERROR} = [ $file, $NR,
+ $entry->{ERROR} = [ $file, $.,
__g( "badly formatted trailer line" ), "$_" ];
$self->_do_parse_error(@{$entry->{ERROR}});
# $expect = 'next heading or eof'
@@ -422,7 +421,7 @@ sub parse {
$expect eq 'start of change data'
|| $expect eq 'more change data or trailer'
|| do {
- $self->_do_parse_error($file, $NR,
+ $self->_do_parse_error($file, $.,
__g( "found change data where expected %s",
$expect ), "$_");
if (($expect eq 'next heading or eof')
@@ -437,7 +436,7 @@ sub parse {
$entry->{Urgency_LC} = 'unknown';
$entry->{Version} = 'unknown'.($unknowncounter++);
$entry->{Urgency_Comment} = '';
- $entry->{ERROR} = [ $file, $NR,
+ $entry->{ERROR} = [ $file, $.,
__g( "found change data where expected %s",
$expect ), "$_" ];
}
@@ -455,12 +454,12 @@ sub parse {
next if $expect eq 'start of change data'
|| $expect eq 'next heading or eof';
$expect eq 'more change data or trailer'
- || $self->_do_parse_error($file, $NR,
+ || $self->_do_parse_error($file, $.,
__g( "found blank line where expected %s",
$expect ));
$blanklines++;
} else {
- $self->_do_parse_error($file, $NR, __g( "unrecognised line" ),
+ $self->_do_parse_error($file, $., __g( "unrecognised line" ),
"$_");
($expect eq 'start of change data'
|| $expect eq 'more change data or trailer')
@@ -475,7 +474,7 @@ sub parse {
}
$blanklines = 0;
$expect = 'more change data or trailer';
- $entry->{ERROR} = [ $file, $NR, __g( "unrecognised line" ),
+ $entry->{ERROR} = [ $file, $., __g( "unrecognised line" ),
"$_" ];
};
}
@@ -483,7 +482,7 @@ sub parse {
$expect eq 'next heading or eof'
|| do {
- $entry->{ERROR} = [ $file, $NR,
+ $entry->{ERROR} = [ $file, $.,
__g( "found eof where expected %s",
$expect ) ];
$self->_do_parse_error( @{$entry->{ERROR}} );
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libparse-debianchangelog-perl.git
More information about the Pkg-perl-cvs-commits
mailing list