[dh-make-perl] 01/01: Strip comments when reading control files.

gregor herrmann gregoa at debian.org
Fri May 20 14:16:54 UTC 2016


This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository dh-make-perl.

commit 4670d952ed2fa45c503cdf0b6a3ebcb0dcee8c1f
Author: Sean Whitton <spwhitton at spwhitton.name>
Date:   Sat May 7 15:24:06 2016 -0700

    Strip comments when reading control files.
    
    Otherwise, control files containing comments cause a parse failure.
    
    Closes: #823708
---
 debian/changelog      | 4 ++++
 lib/Debian/Control.pm | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index aaee1eb..c721f8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,10 @@ dh-make-perl (0.91) UNRELEASED; urgency=medium
     Thanks to Jacob L Anawalt for the bug report. (Closes: #820395)
   * debian/copyright: change Copyright-Format 1.0 URL to HTTPS.
 
+  [ Sean Whitton ]
+  * Strip comments when reading control files.  (Closes: #823708)
+    Otherwise, control files containing comments cause a parse failure.
+
   [ Salvatore Bonaccorso ]
   * Use HTTPS transport protocol for Format URI in copyright file.
     Refresh or create new copyright files using HTTPS transport protocol for
diff --git a/lib/Debian/Control.pm b/lib/Debian/Control.pm
index c9e1eb8..4244766 100644
--- a/lib/Debian/Control.pm
+++ b/lib/Debian/Control.pm
@@ -115,7 +115,7 @@ sub read {
     }
 
     my $stanzas = $self->_parser->$parser_method( $file,
-        { useTieIxHash => 1, verbMultiLine => 1 } );
+        { useTieIxHash => 1, verbMultiLine => 1, stripComments => 1 } );
 
     for (@$stanzas) {
         if ( $_->{Source} ) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/dh-make-perl.git



More information about the Pkg-perl-cvs-commits mailing list