diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:32:50 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:32:50 +0000 |
commit | 25f9982ce22e4d6d7dddf6fb8e1c7f9c43e3c699 (patch) | |
tree | 7565f09f5bdef1bc398c3caebde90bced9ea1c51 /scripts/Dpkg/Changelog | |
parent | Adding debian version 1.22.9. (diff) | |
download | dpkg-25f9982ce22e4d6d7dddf6fb8e1c7f9c43e3c699.tar.xz dpkg-25f9982ce22e4d6d7dddf6fb8e1c7f9c43e3c699.zip |
Merging upstream version 1.22.10.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'scripts/Dpkg/Changelog')
-rw-r--r-- | scripts/Dpkg/Changelog/Debian.pm | 2 | ||||
-rw-r--r-- | scripts/Dpkg/Changelog/Entry/Debian.pm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Dpkg/Changelog/Debian.pm b/scripts/Dpkg/Changelog/Debian.pm index e7dd7c4..051bea7 100644 --- a/scripts/Dpkg/Changelog/Debian.pm +++ b/scripts/Dpkg/Changelog/Debian.pm @@ -200,7 +200,7 @@ sub parse { $self->parse_error($file, $., $error, $_); } $expect = NEXT_OR_EOF; - } elsif (m/^ \-\-/) { + } elsif (m/^ --/) { $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) { diff --git a/scripts/Dpkg/Changelog/Entry/Debian.pm b/scripts/Dpkg/Changelog/Entry/Debian.pm index c646fcc..11c0906 100644 --- a/scripts/Dpkg/Changelog/Entry/Debian.pm +++ b/scripts/Dpkg/Changelog/Entry/Debian.pm @@ -70,7 +70,7 @@ my $regex_header = qr{ # day of week ($6), date-time ($7) and this into month name ($8). my $regex_trailer = qr< ^ - \ \-\- # Trailer marker + \ -- # Trailer marker \ (.*) # Maintainer name \ \<(.*)\> # Maintainer email (\ \ ?) # Blanks @@ -84,7 +84,7 @@ my $regex_trailer = qr< ) ) \s*$ # Trailing space ->xo; +>x; my %week_day = map { $_ => 1 } qw(Mon Tue Wed Thu Fri Sat Sun); my @month_abbrev = qw( |