Author: rra
Date: 2007-10-15 03:56:44 +0200 (Mon, 15 Oct 2007)
New Revision: 962

Modified:
   trunk/checks/control-file
   trunk/debian/changelog
   trunk/testset/binary/debian/control
Log:
* checks/control-file:
  + [RA] Support and ignore comments in debian/control.  Thanks, Julien
    Cristau.  (Closes: #440830)

Modified: trunk/checks/control-file
===================================================================
--- trunk/checks/control-file   2007-10-15 01:38:31 UTC (rev 961)
+++ trunk/checks/control-file   2007-10-15 01:56:44 UTC (rev 962)
@@ -43,6 +43,7 @@
 open (CONTROL, "debfiles/control") or fail "Couldn't read debfiles/control: 
$!";
 while (<CONTROL>) {
        s/\s*\n$//;
+       next if /^\#/;
 
        #Reset seen_fields if we enter a new section:
        $seen_fields = {} if /^$/;

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2007-10-15 01:38:31 UTC (rev 961)
+++ trunk/debian/changelog      2007-10-15 01:56:44 UTC (rev 962)
@@ -6,6 +6,9 @@
       and unreleased for the distribution.  (Closes: #437707)
   * checks/common_data.pm:
     + [RA] Allow Homepage in source and binary packages.
+  * checks/control-file:
+    + [RA] Support and ignore comments in debian/control.  Thanks, Julien
+      Cristau.  (Closes: #440830)
   * checks/cruft.desc:
     + [RA] Fix incorrect tag name for patch failure files.  Thanks, Romain
       Francoise.  (Closes: #437463)
@@ -40,7 +43,7 @@
   * collection/changelog-file{.desc,}:
     + [RA] Collect NEWS.Debian as well as changelog.
 
- -- Russ Allbery <[EMAIL PROTECTED]>  Sun, 14 Oct 2007 18:38:07 -0700
+ -- Russ Allbery <[EMAIL PROTECTED]>  Sun, 14 Oct 2007 18:53:49 -0700
 
 lintian (1.23.34) unstable; urgency=low
 

Modified: trunk/testset/binary/debian/control
===================================================================
--- trunk/testset/binary/debian/control 2007-10-15 01:38:31 UTC (rev 961)
+++ trunk/testset/binary/debian/control 2007-10-15 01:56:44 UTC (rev 962)
@@ -23,3 +23,11 @@
 Description: test handling of binary relationships
  Regression test for lintian's checking of package relationships between
  arch:any and arch:all packages.
+
+#Package: binary-comment
+#Architecture: space-almonds
+#Depends: *
+#Depends: *
+#Description: test comment support
+# Yes, comments are actually allowed in debian/control, so none of the
+# above should produce errors.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to