summaryrefslogtreecommitdiff
path: root/scripts/Dpkg/Changelog
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/Dpkg/Changelog')
-rw-r--r--scripts/Dpkg/Changelog/Debian.pm34
-rw-r--r--scripts/Dpkg/Changelog/Entry.pm12
-rw-r--r--scripts/Dpkg/Changelog/Entry/Debian.pm18
-rw-r--r--scripts/Dpkg/Changelog/Parse.pm36
4 files changed, 50 insertions, 50 deletions
diff --git a/scripts/Dpkg/Changelog/Debian.pm b/scripts/Dpkg/Changelog/Debian.pm
index fdc4180a6..bad97a671 100644
--- a/scripts/Dpkg/Changelog/Debian.pm
+++ b/scripts/Dpkg/Changelog/Debian.pm
@@ -43,7 +43,7 @@ package Dpkg::Changelog::Debian;
use strict;
use warnings;
-our $VERSION = "1.00";
+our $VERSION = '1.00';
use Dpkg::Gettext;
use Dpkg::Changelog qw(:util);
@@ -86,7 +86,7 @@ sub parse {
(my $options = $4) =~ s/^\s+//;
unless ($expect eq FIRST_HEADING || $expect eq NEXT_OR_EOF) {
$self->parse_error($file, $.,
- sprintf(_g("found start of entry where expected %s"),
+ sprintf(_g('found start of entry where expected %s'),
$expect), "$_");
}
unless ($entry->is_empty) {
@@ -121,32 +121,32 @@ sub parse {
# save entries on old changelog format verbatim
# we assume the rest of the file will be in old format once we
# hit it for the first time
- $self->set_unparsed_tail("$_\n" . join("", <$fh>));
+ $self->set_unparsed_tail("$_\n" . join('', <$fh>));
} elsif (m/^\S/) {
- $self->parse_error($file, $., _g("badly formatted heading line"), "$_");
+ $self->parse_error($file, $., _g('badly formatted heading line'), "$_");
} elsif ($_ =~ $regex_trailer) {
unless ($expect eq CHANGES_OR_TRAILER) {
$self->parse_error($file, $.,
- sprintf(_g("found trailer where expected %s"), $expect), "$_");
+ sprintf(_g('found trailer where expected %s'), $expect), "$_");
}
- $entry->set_part("trailer", $_);
- $entry->extend_part("blank_after_changes", [ @blanklines ]);
+ $entry->set_part('trailer', $_);
+ $entry->extend_part('blank_after_changes', [ @blanklines ]);
@blanklines = ();
foreach my $error ($entry->check_trailer()) {
$self->parse_error($file, $., $error, $_);
}
$expect = NEXT_OR_EOF;
} elsif (m/^ \-\-/) {
- $self->parse_error($file, $., _g("badly formatted trailer line"), "$_");
+ $self->parse_error($file, $., _g('badly formatted trailer line'), "$_");
} elsif (m/^\s{2,}(\S)/) {
unless ($expect eq START_CHANGES or $expect eq CHANGES_OR_TRAILER) {
- $self->parse_error($file, $., sprintf(_g("found change data" .
- " where expected %s"), $expect), "$_");
+ $self->parse_error($file, $., sprintf(_g('found change data' .
+ ' where expected %s'), $expect), "$_");
if ($expect eq NEXT_OR_EOF and not $entry->is_empty) {
# lets assume we have missed the actual header line
push @{$self->{data}}, $entry;
$entry = Dpkg::Changelog::Entry::Debian->new();
- $entry->set_part('header', "unknown (unknown" . ($unknowncounter++) . ") unknown; urgency=unknown");
+ $entry->set_part('header', 'unknown (unknown' . ($unknowncounter++) . ') unknown; urgency=unknown');
}
}
# Keep raw changes
@@ -155,21 +155,21 @@ sub parse {
$expect = CHANGES_OR_TRAILER;
} elsif (!m/\S/) {
if ($expect eq START_CHANGES) {
- $entry->extend_part("blank_after_header", $_);
+ $entry->extend_part('blank_after_header', $_);
next;
} elsif ($expect eq NEXT_OR_EOF) {
- $entry->extend_part("blank_after_trailer", $_);
+ $entry->extend_part('blank_after_trailer', $_);
next;
} elsif ($expect ne CHANGES_OR_TRAILER) {
$self->parse_error($file, $.,
- sprintf(_g("found blank line where expected %s"), $expect));
+ sprintf(_g('found blank line where expected %s'), $expect));
}
push @blanklines, $_;
} else {
- $self->parse_error($file, $., _g("unrecognized line"), "$_");
+ $self->parse_error($file, $., _g('unrecognized line'), "$_");
unless ($expect eq START_CHANGES or $expect eq CHANGES_OR_TRAILER) {
# lets assume change data if we expected it
- $entry->extend_part("changes", [ @blanklines, $_]);
+ $entry->extend_part('changes', [ @blanklines, $_]);
@blanklines = ();
$expect = CHANGES_OR_TRAILER;
}
@@ -177,7 +177,7 @@ sub parse {
}
unless ($expect eq NEXT_OR_EOF) {
- $self->parse_error($file, $., sprintf(_g("found eof where expected %s"),
+ $self->parse_error($file, $., sprintf(_g('found eof where expected %s'),
$expect));
}
unless ($entry->is_empty) {
diff --git a/scripts/Dpkg/Changelog/Entry.pm b/scripts/Dpkg/Changelog/Entry.pm
index 1f6907f65..f41444de7 100644
--- a/scripts/Dpkg/Changelog/Entry.pm
+++ b/scripts/Dpkg/Changelog/Entry.pm
@@ -18,7 +18,7 @@ package Dpkg::Changelog::Entry;
use strict;
use warnings;
-our $VERSION = "1.00";
+our $VERSION = '1.00';
use Dpkg::Gettext;
use Dpkg::ErrorHandling;
@@ -110,7 +110,7 @@ lines) corresponding to the requested part. $part can be
sub get_part {
my ($self, $part) = @_;
- internerr("invalid part of changelog entry: %s") unless exists $self->{$part};
+ internerr('invalid part of changelog entry: %s') unless exists $self->{$part};
return $self->{$part};
}
@@ -123,7 +123,7 @@ or an array ref.
sub set_part {
my ($self, $part, $value) = @_;
- internerr("invalid part of changelog entry: %s") unless exists $self->{$part};
+ internerr('invalid part of changelog entry: %s') unless exists $self->{$part};
if (ref($self->{$part})) {
if (ref($value)) {
$self->{$part} = $value;
@@ -145,7 +145,7 @@ concatenated at the end of the current line.
sub extend_part {
my ($self, $part, $value, @rest) = @_;
- internerr("invalid part of changelog entry: %s") unless exists $self->{$part};
+ internerr('invalid part of changelog entry: %s') unless exists $self->{$part};
if (ref($self->{$part})) {
if (ref($value)) {
push @{$self->{$part}}, @$value;
@@ -288,9 +288,9 @@ in the output format of C<dpkg-parsechangelog>.
sub get_dpkg_changes {
my ($self) = @_;
- my $header = $self->get_part("header") || "";
+ my $header = $self->get_part('header') || '';
$header =~ s/\s+$//;
- return "\n$header\n\n" . join("\n", @{$self->get_part("changes")});
+ return "\n$header\n\n" . join("\n", @{$self->get_part('changes')});
}
=back
diff --git a/scripts/Dpkg/Changelog/Entry/Debian.pm b/scripts/Dpkg/Changelog/Entry/Debian.pm
index 48e21ce9d..89da916f4 100644
--- a/scripts/Dpkg/Changelog/Entry/Debian.pm
+++ b/scripts/Dpkg/Changelog/Entry/Debian.pm
@@ -18,7 +18,7 @@ package Dpkg::Changelog::Entry::Debian;
use strict;
use warnings;
-our $VERSION = "1.00";
+our $VERSION = '1.00';
use Exporter;
use Dpkg::Changelog::Entry;
@@ -77,7 +77,7 @@ following line necessarily starts a new item).
sub get_change_items {
my ($self) = @_;
my (@items, @blanks, $item);
- foreach my $line (@{$self->get_part("changes")}) {
+ foreach my $line (@{$self->get_part('changes')}) {
if ($line =~ /^\s*\*/) {
push @items, $item if defined $item;
$item = "$line\n";
@@ -125,18 +125,18 @@ sub check_header {
}
my ($k, $v) = (field_capitalize($1), $2);
if ($optdone{$k}) {
- push @errors, sprintf(_g("repeated key-value %s"), $k);
+ push @errors, sprintf(_g('repeated key-value %s'), $k);
}
$optdone{$k} = 1;
if ($k eq 'Urgency') {
- push @errors, sprintf(_g("badly formatted urgency value: %s"), $v)
+ push @errors, sprintf(_g('badly formatted urgency value: %s'), $v)
unless ($v =~ m/^([-0-9a-z]+)((\s+.*)?)$/i);
} elsif ($k eq 'Binary-Only') {
- push @errors, sprintf(_g("bad binary-only value: %s"), $v)
- unless ($v eq "yes");
+ push @errors, sprintf(_g('bad binary-only value: %s'), $v)
+ unless ($v eq 'yes');
} elsif ($k =~ m/^X[BCS]+-/i) {
} else {
- push @errors, sprintf(_g("unknown key-value %s"), $k);
+ push @errors, sprintf(_g('unknown key-value %s'), $k);
}
}
my ($ok, $msg) = version_check($version);
@@ -154,7 +154,7 @@ sub check_trailer {
my @errors;
if (defined($self->{trailer}) and $self->{trailer} =~ $regex_trailer) {
if ($3 ne ' ') {
- push @errors, _g("badly formatted trailer line");
+ push @errors, _g('badly formatted trailer line');
}
unless (defined str2time($4)) {
push @errors, sprintf(_g("couldn't parse date %s"), $4);
@@ -220,7 +220,7 @@ sub get_optional_fields {
}
my @closes = find_closes(join("\n", @{$self->{changes}}));
if (@closes) {
- $f->{Closes} = join(" ", @closes);
+ $f->{Closes} = join(' ', @closes);
}
return $f;
}
diff --git a/scripts/Dpkg/Changelog/Parse.pm b/scripts/Dpkg/Changelog/Parse.pm
index f01cce14f..538301273 100644
--- a/scripts/Dpkg/Changelog/Parse.pm
+++ b/scripts/Dpkg/Changelog/Parse.pm
@@ -34,7 +34,7 @@ package Dpkg::Changelog::Parse;
use strict;
use warnings;
-our $VERSION = "1.00";
+our $VERSION = '1.00';
use Dpkg; # for $dpkglibdir
use Dpkg::Gettext;
@@ -74,11 +74,11 @@ it's passed as the parameter that follows.
sub changelog_parse {
my (%options) = @_;
- my @parserpath = ("/usr/local/lib/dpkg/parsechangelog",
+ my @parserpath = ('/usr/local/lib/dpkg/parsechangelog',
"$dpkglibdir/parsechangelog",
- "/usr/lib/dpkg/parsechangelog");
- my $format = "debian";
- my $changelogfile = "debian/changelog";
+ '/usr/lib/dpkg/parsechangelog');
+ my $format = 'debian';
+ my $changelogfile = 'debian/changelog';
my $force = 0;
# Extract and remove options that do not concern the changelog parser
@@ -98,12 +98,12 @@ sub changelog_parse {
}
# Extract the format from the changelog file if possible
- unless($force or ($changelogfile eq "-")) {
- open(my $format_fh, "-|", "tail", "-n", "40", $changelogfile);
+ unless($force or ($changelogfile eq '-')) {
+ open(my $format_fh, '-|', 'tail', '-n', '40', $changelogfile);
while (<$format_fh>) {
$format = $1 if m/\schangelog-format:\s+([0-9a-z]+)\W/;
}
- close($format_fh) or subprocerr(_g("tail of %s"), $changelogfile);
+ close($format_fh) or subprocerr(_g('tail of %s'), $changelogfile);
}
# Find the right changelog parser
@@ -115,10 +115,10 @@ sub changelog_parse {
$parser = $candidate;
last;
} else {
- warning(_g("format parser %s not executable"), $candidate);
+ warning(_g('format parser %s not executable'), $candidate);
}
}
- error(_g("changelog format %s is unknown"), $format) if not defined $parser;
+ error(_g('changelog format %s is unknown'), $format) if not defined $parser;
# Create the arguments for the changelog parser
my @exec = ($parser, "-l$changelogfile");
@@ -134,24 +134,24 @@ sub changelog_parse {
}
# Fork and call the parser
- my $pid = open(my $parser_fh, "-|");
- syserr(_g("cannot fork for %s"), $parser) unless defined $pid;
+ my $pid = open(my $parser_fh, '-|');
+ syserr(_g('cannot fork for %s'), $parser) unless defined $pid;
if (not $pid) {
- if ($changelogfile ne "-") {
- open(STDIN, "<", $changelogfile) or
- syserr(_g("cannot open %s"), $changelogfile);
+ if ($changelogfile ne '-') {
+ open(STDIN, '<', $changelogfile) or
+ syserr(_g('cannot open %s'), $changelogfile);
}
- exec(@exec) || syserr(_g("cannot exec format parser: %s"), $parser);
+ exec(@exec) || syserr(_g('cannot exec format parser: %s'), $parser);
}
# Get the output into several Dpkg::Control objects
my (@res, $fields);
while (1) {
$fields = Dpkg::Control::Changelog->new();
- last unless $fields->parse($parser_fh, _g("output of changelog parser"));
+ last unless $fields->parse($parser_fh, _g('output of changelog parser'));
push @res, $fields;
}
- close($parser_fh) or subprocerr(_g("changelog parser %s"), $parser);
+ close($parser_fh) or subprocerr(_g('changelog parser %s'), $parser);
if (wantarray) {
return @res;
} else {