diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | scripts/Dpkg/Control/Hash.pm | 2 | ||||
| -rw-r--r-- | scripts/t/700_Dpkg_Control.t | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 1ac63e9c8..f386065e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ dpkg (1.15.5.3) UNRELEASED; urgency=low * Verify that the alternative used in update-alternatives --set has been registered instead of failing with an undefined value in the slave method. Closes: #554136 + * Strip leading spaces in the first line of a field's value in + Dpkg::Control::Hash. Closes: #557547 -- Raphael Hertzog <hertzog@debian.org> Sat, 21 Nov 2009 14:57:50 +0100 diff --git a/scripts/Dpkg/Control/Hash.pm b/scripts/Dpkg/Control/Hash.pm index afb177b7e..06d34d1e1 100644 --- a/scripts/Dpkg/Control/Hash.pm +++ b/scripts/Dpkg/Control/Hash.pm @@ -168,7 +168,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)); diff --git a/scripts/t/700_Dpkg_Control.t b/scripts/t/700_Dpkg_Control.t index d30a068e9..5714025e9 100644 --- a/scripts/t/700_Dpkg_Control.t +++ b/scripts/t/700_Dpkg_Control.t @@ -48,7 +48,7 @@ Depends: hello Package: mypackage3 Depends: hello -Description: short one +Description: short one long one very long one '; |