diff options
| author | Raphaël Hertzog <hertzog@debian.org> | 2009-11-29 17:02:08 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2009-11-29 17:02:08 +0100 |
| commit | 0fc211581b9bfbc2b1575d4bd79fa06fc30d6083 (patch) | |
| tree | 31ed6a7c8e2918fa4c1d7d00bc1deb63e61cbec4 /scripts/Dpkg/Control | |
| parent | abf378780102adedb7d13f4d36a1641d8856499e (diff) | |
| parent | b6a2926a1670d28583ad38c43981fb2f425057de (diff) | |
| download | dpkg-0fc211581b9bfbc2b1575d4bd79fa06fc30d6083.tar.gz | |
Merge sid branch through commit '1.15.5.3'
Conflicts:
man/po/de.po
man/po/sv.po
scripts/dpkg-scanpackages.pl
scripts/po/de.po
scripts/po/sv.po
Diffstat (limited to 'scripts/Dpkg/Control')
| -rw-r--r-- | scripts/Dpkg/Control/Hash.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/Dpkg/Control/Hash.pm b/scripts/Dpkg/Control/Hash.pm index afb177b7e..75fbc8957 100644 --- a/scripts/Dpkg/Control/Hash.pm +++ b/scripts/Dpkg/Control/Hash.pm @@ -52,6 +52,9 @@ unchanged directly after the field name, supplementary lines are modified. Empty lines and lines containing only dots are prefixed with " ." (space + dot) while other lines are prefixed with a single space. +During parsing, trailing spaces are stripped on all lines while leading +spaces are stripped only on the first line of each field. + =head1 FUNCTIONS =over 4 @@ -168,7 +171,7 @@ sub parse_fh { next if (m/^$/ and $paraborder); next if (m/^#/); $paraborder = 0; - if (m/^(\S+?)\s*:\s?(.*)$/) { + if (m/^(\S+?)\s*:\s*(.*)$/) { if (exists $self->{$1}) { unless ($$self->{'allow_duplicate'}) { syntaxerr($desc, sprintf(_g("duplicate field %s found"), $1)); |