[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.12-104-gc8d9f5a



The following commit has been merged in the master branch:
commit f8d8cc8119c3ec3bf91df6d78c9fd0f56f1ce463
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date:   Sun May 19 21:40:12 2013 +0200

    Allow indenting text with pipe
    
    Some package indent the license like this:
        | Permission is granted to copy, distribute and/or modify this
        | document under the terms of the GNU Free Documentation License,
        | version 1.3 or any later version published by the Free Software
        | Foundation; with no Invariant Sections, no Front-Cover Texts and
        | no Back-Cover Texts.  A copy of the license is included in the
        | section entitled "GNU Free Documentation License".
    
    Allow it.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/cruft b/checks/cruft
index 19bd146..80413c3 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -487,7 +487,7 @@ sub find_cruft {
                         my $s = qr{(?:
                           \s          |  # regular space(s)
                           \@c         |  # Tex info comment
-                          [%\*\"]     |  # String, C-style comment/javadoc indent and quotes for strings
+                          [%\*\"\|]   |  # String, C-style comment/javadoc indent, quotes for strings, pipe in some txt
                           \"\s*,      |  # String array (e.g. "line1",\n"line2")
                           ,\s*\"      |  # String array (e.g. "line1"\n ,"line2"), seen in findutils
                           \n[-\+!<>]  |  # diff/patch lines
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/pipeindent.txt b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/pipeindent.txt
new file mode 100644
index 0000000..8a0594a
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/pipeindent.txt
@@ -0,0 +1,7 @@
+Some user ident with pipe (|)
+    | Permission is granted to copy, distribute and/or modify this
+    | document under the terms of the GNU Free Documentation License,
+    | version 1.3 or any later version published by the Free Software
+    | Foundation; with no Invariant Sections, no Front-Cover Texts and
+    | no Back-Cover Texts.  A copy of the license is included in the
+    | section entitled "GNU Free Documentation License".

-- 
Debian package checker


Reply to: