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

[lintian] 04/05: Fix test failure

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

broucaries-guest pushed a commit to branch master
in repository lintian.

commit 129a1f352f6031820e6321635243bc021d449984
Author: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
Date:   Mon Jan 6 22:20:24 2014 +0100

    Fix test failure
    
    Signed-off-by: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
---
 checks/files.pm     | 13 ++++++-------
 checks/rules.desc   |  4 ++--
 checks/scripts.desc |  4 ++--
 debian/changelog    |  5 +++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/checks/files.pm b/checks/files.pm
index 147c9d3..f856b07 100644
--- a/checks/files.pm
+++ b/checks/files.pm
@@ -53,12 +53,11 @@ my $COMPRESS_FILE_EXTENSIONS
     qr/\s++/,sub { return qr/\Q$_[0]\E/ });
 
 # an OR (|) regex of all compressed extension
-my $COMPRESS_FILE_EXTENSIONS_OR_ALL = sub { qr/$_[0]/ }
+my $COMPRESS_FILE_EXTENSIONS_OR_ALL = sub { qr/(:?$_[0])/ }
   ->(
-    join(
-        '|',
-        map($COMPRESS_FILE_EXTENSIONS->value($_),
-            $COMPRESS_FILE_EXTENSIONS->all)));
+    join('|',
+        map {$COMPRESS_FILE_EXTENSIONS->value($_) }
+          $COMPRESS_FILE_EXTENSIONS->all));
 
 # see tag duplicated-compressed-file
 my $DUPLICATED_COMPRESSED_FILE_REGEX
@@ -79,8 +78,8 @@ my $VCS_FILES = Lintian::Data->new(
     });
 
 # an OR (|) regex of all vcs files
-my $VCS_FILES_OR_ALL = sub { qr/$_[0]/ }
-  ->(join('|',map($VCS_FILES->value($_),$VCS_FILES->all)));
+my $VCS_FILES_OR_ALL = sub { qr/(?:$_[0])/ }
+  ->(join('|', map { $VCS_FILES->value($_) } $VCS_FILES->all));
 
 # A list of known packaged Javascript libraries
 # and the packages providing them
diff --git a/checks/rules.desc b/checks/rules.desc
index e1a1931..803bd04 100644
--- a/checks/rules.desc
+++ b/checks/rules.desc
@@ -228,9 +228,9 @@ Certainty: possible
 Ref: policy 4.9
 Info: The rules file use the make variable $(_).
  .
- According to Policy 4.9, <q>invoking either of <tt>make -f debian/rules
+ According to Policy 4.9, 'invoking either of <tt>make -f debian/rules
  &lt;args&hellip;&gt;</tt> or <tt>./debian/rules
- &lt;args&hellip;&gt;</b>' must result in identical behavior.</q>
+ &lt;args&hellip;&gt;</tt>' must result in identical behavior.
  One way to inadvertently violate this policy is to use the $_ variable.
  .
  If the rules file uses $(dir $(_)) to discover the directory containing
diff --git a/checks/scripts.desc b/checks/scripts.desc
index 2e9ba5d..921f17f 100644
--- a/checks/scripts.desc
+++ b/checks/scripts.desc
@@ -609,10 +609,10 @@ Info:  The maintainer script apparently runs 'adduser --system'
  but hardcodes a path under '/home' for the '--home' option or
  do not use the '--home' option.
  .
- The FHS says: <q>/home is a fairly standard concept, but it
+ The FHS says: /home is a fairly standard concept, but it
  is clearly a site-specific filesystem. The setup will differ
  from host to host. Therefore, no program should rely on this
- location.</q>
+ location.
 Ref: fhs homeuserhomedirectories
 
 Tag: maintainer-script-empty
diff --git a/debian/changelog b/debian/changelog
index 623dcc0..0835564 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,7 +30,8 @@ lintian (2.5.21) UNRELEASED; urgency=medium
       (Closes: #729037).
     + [BR] Check privacy breach only in regular file.
     + [BR] Add link tag as potential privacy breaker.
-    + [BR] Add <div data-href="http://website"; to potential privacy breaker.
+    + [BR] Add <div data-href="http://website"; to potential privacy 
+      breaker.
 
   * checks/rules.{desc,pm}:
     + [BR] Use Lintian::Data for forbidden construct in rules
@@ -65,7 +66,7 @@ lintian (2.5.21) UNRELEASED; urgency=medium
   * data/files/obsolete-paths:
     + [BR] Add /etc/X11/fonts/X11R7 as obsolete path (Closes: #646872).
 
-  * data/files/privacy-breaker-{fragments,websites}
+  * data/files/privacy-breaker-{fragments,websites}:
     + [BR] Add w3c website valid x?html icons.
     + [BR] Add piwik detection.
     + [BR] Add detection of well known statistics websites.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: