summaryrefslogtreecommitdiff
path: root/scripts/Dpkg/Control
diff options
context:
space:
mode:
authorRoger Leigh <rleigh@debian.org>2011-03-12 16:04:31 +0000
committerRaphaël Hertzog <hertzog@debian.org>2011-03-12 18:10:05 +0100
commit898936120e987d9faf27002e2d01844edbfbb538 (patch)
treea47f367eeebd1b0cc7e9d9dd79ccbb75ce047676 /scripts/Dpkg/Control
parent2bfd5102b413d3a0b97aa93e50467f41b2448ecf (diff)
downloaddpkg-898936120e987d9faf27002e2d01844edbfbb538.tar.gz
Dpkg::Control::Hash: accept PGP signature as end of block
Improved-by: Raphaël Hertzog <hertzog@debian.org>
Diffstat (limited to 'scripts/Dpkg/Control')
-rw-r--r--scripts/Dpkg/Control/Hash.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Dpkg/Control/Hash.pm b/scripts/Dpkg/Control/Hash.pm
index 9ecf7d346..82157d952 100644
--- a/scripts/Dpkg/Control/Hash.pm
+++ b/scripts/Dpkg/Control/Hash.pm
@@ -193,7 +193,7 @@ sub parse {
} else {
syntaxerr($desc, _g("PGP signature not allowed here"));
}
- } elsif (m/^$/) {
+ } elsif (m/^$/ || ($expect_pgp_sig && m/^-----BEGIN PGP SIGNATURE/)) {
if ($expect_pgp_sig) {
# Skip empty lines
$_ = <$fh> while defined($_) && $_ =~ /^\s*$/;