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

[SCM] Debian package checker branch, master, updated. 2.5.11-215-ga0bd377

The following commit has been merged in the master branch:
commit a0bd37700d159f73257a40ed510e1e06c216e608
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Apr 2 19:27:54 2013 +0200

    Enable "Modules" critic policies and fix code accordingly
    
    Enable most of perlcritic's "Modules" policies and update the source
    code to match the new requirements.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/.perlcriticrc b/.perlcriticrc
index deeb2e6..055de62 100644
--- a/.perlcriticrc
+++ b/.perlcriticrc
@@ -8,9 +8,11 @@ severity = 1
 # Work based on a whitelist
 only = 1
 # Our whitelist (ignores severity):
-include = ExplicitReturnUndef GlobFunction NegativeIndices PrivateVars UselessInitialization MatchVars NumberSeparators NullStatements LongChainsOfMethodCalls UseStrict UseWarnings EndWithOne ConditionalUseStatements PackageMatchesPodName JoinedReadline UnreachableCode TrailingWhitespace InterpolationOfLiterals ImplicitNewlines CommaSeparatedStatements UseStrict UseWarnings UnusedVariables UnusedCapture TwoArgOpen ProhibitHardTabs MismatchedOperators IndirectSyntax
+include = ExplicitReturnUndef GlobFunction NegativeIndices PrivateVars UselessInitialization MatchVars NumberSeparators NullStatements LongChainsOfMethodCalls UseStrict UseWarnings EndWithOne ConditionalUseStatements PackageMatchesPodName JoinedReadline UnreachableCode TrailingWhitespace InterpolationOfLiterals ImplicitNewlines CommaSeparatedStatements UseStrict UseWarnings UnusedVariables UnusedCapture TwoArgOpen ProhibitHardTabs MismatchedOperators IndirectSyntax Modules::
 #include = MixedBooleanOperators InteractiveTest UpperCaseHeredoc ReusedNames PackageVars ConditionalDeclarations SingleCharAlternation FixedStringMatches ConditionalUseStatements QuotedWordLists
 
+exclude = RequireFilenameMatchesPackage RequireVersionVar ProhibitExcessMainComplexity
+
 # If you want to try some other stuff, uncomment the following
 # (exclude is an incomplete list of things we probably won't change)
 # theme = security || bugs || complexity || maintenance
@@ -26,6 +28,14 @@ allow-unsafe = 1
 
 [BuiltinFunctions::ProhibitBooleanGrep]
 
+# Checks and collections blow up
+[-Modules::RequireFilenameMatchesPackage]
+# We don't use package versions atm and even if we did, it probably
+# won't have full coverage anyway.
+[-Modules::RequireVersionVar]
+# Maybe some day...
+[-Modules::ProhibitExcessMainComplexity]
+
 [ValuesAndExpressions::ProhibitInterpolationOfLiterals]
 allow_if_string_contains_single_quote = 1
 
diff --git a/checks/group-checks b/checks/group-checks
index 1713a1e..b3af658 100644
--- a/checks/group-checks
+++ b/checks/group-checks
@@ -175,8 +175,9 @@ sub _check_multiarch {
 }
 
 ## Encapsulate Tarjan's algorithm in an class/object to keep
-## the run sub somewhat sane.
-package Lintian::group_checks::Graph;
+## the run sub somewhat sane.  Allow this "extra" package as
+## it is not a proper subclass.
+package Lintian::group_checks::Graph;  ## no critic (Modules::ProhibitMultiplePackages)
 
 sub new {
     my ($type, $nodes, $edges) = @_;
diff --git a/frontend/lintian b/frontend/lintian
index 0b7d5f2..a146367 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -658,7 +658,7 @@ require Lintian::Data;
 require Lintian::Output;
 import Lintian::Output qw(:messages);
 require Lintian::Internal::FrontendUtil;
-import Lintian::Internal::FrontendUtil;
+import Lintian::Internal::FrontendUtil qw(default_parallel load_collections);
 require Lintian::ProcessablePool;
 require Lintian::Profile;
 require Lintian::Tags;
diff --git a/lib/Lintian/Check.pm b/lib/Lintian/Check.pm
index 9c2e406..50cedc6 100644
--- a/lib/Lintian/Check.pm
+++ b/lib/Lintian/Check.pm
@@ -31,8 +31,8 @@ use Lintian::Tags qw(tag);
 
 our $KNOWN_BOUNCE_ADDRESSES = Lintian::Data->new('fields/bounce-addresses');
 
-our @EXPORT = qw(check_maintainer check_spelling check_spelling_picky
-                 $known_shells_regex
+our @EXPORT_OK = qw(check_maintainer check_spelling check_spelling_picky
+                    $known_shells_regex
 );
 
 
diff --git a/lib/Lintian/Internal/FrontendUtil.pm b/lib/Lintian/Internal/FrontendUtil.pm
index 0ece810..84d5b96 100644
--- a/lib/Lintian/Internal/FrontendUtil.pm
+++ b/lib/Lintian/Internal/FrontendUtil.pm
@@ -27,7 +27,7 @@ use Dpkg::Vendor;
 use Lintian::CollScript;
 use Lintian::Util qw(check_path fail);
 
-our @EXPORT = qw(check_test_feature default_parallel load_collections split_tag);
+our @EXPORT_OK = qw(check_test_feature default_parallel load_collections split_tag);
 
 # Check if we are testing a specific feature
 #  - e.g. vendor-libdpkg-perl
diff --git a/lib/Lintian/Relation.pm b/lib/Lintian/Relation.pm
index 4c81371..6113443 100644
--- a/lib/Lintian/Relation.pm
+++ b/lib/Lintian/Relation.pm
@@ -39,7 +39,7 @@ our (@EXPORT_OK, %EXPORT_TAGS);
     @{ $EXPORT_TAGS{constants} }
 );
 
-use Lintian::Relation::Version;
+use Lintian::Relation::Version qw(:all);
 
 =head1 NAME
 
diff --git a/lib/Lintian/Relation/Version.pm b/lib/Lintian/Relation/Version.pm
index 4d82535..8f8aac5 100644
--- a/lib/Lintian/Relation/Version.pm
+++ b/lib/Lintian/Relation/Version.pm
@@ -27,8 +27,9 @@ use Carp qw(croak);
 use Exporter qw(import);
 
 BEGIN {
-    our @EXPORT = qw(versions_equal versions_lte versions_gte versions_lt
-                     versions_gt versions_compare versions_comparator);
+    our @EXPORT_OK = qw(versions_equal versions_lte versions_gte versions_lt
+                        versions_gt versions_compare versions_comparator);
+    our %EXPORT_TAGS = ('all' => \@EXPORT_OK);
 }
 
 use AptPkg::Config '$_config';
diff --git a/lib/Lintian/Tag/TextUtil.pm b/lib/Lintian/Tag/TextUtil.pm
index c3d3886..f7e738a 100644
--- a/lib/Lintian/Tag/TextUtil.pm
+++ b/lib/Lintian/Tag/TextUtil.pm
@@ -25,7 +25,7 @@ use strict;
 use warnings;
 
 use Exporter qw(import);
-our @EXPORT = qw(split_paragraphs wrap_paragraphs dtml_to_html dtml_to_text);
+our @EXPORT_OK = qw(split_paragraphs wrap_paragraphs dtml_to_html dtml_to_text);
 
 # requires wrap() function
 use Text::Wrap;
diff --git a/lib/Lintian/Tags.pm b/lib/Lintian/Tags.pm
index e01d753..db8738a 100644
--- a/lib/Lintian/Tags.pm
+++ b/lib/Lintian/Tags.pm
@@ -31,7 +31,7 @@ use Lintian::Tag::Override;
 use Lintian::Util qw(fail $PKGNAME_REGEX strip);
 
 BEGIN {
-    our @EXPORT = qw(tag);
+    our @EXPORT_OK = qw(tag);
 }
 
 # The default Lintian::Tags object, set to the first one constructed and
diff --git a/t/scripts/version.t b/t/scripts/version.t
index 42959bd..57d7e74 100755
--- a/t/scripts/version.t
+++ b/t/scripts/version.t
@@ -5,7 +5,7 @@ use warnings;
 
 use Test::More tests => 13;
 
-use Lintian::Relation::Version;
+use Lintian::Relation::Version qw(:all);
 
 ok(  versions_equal('1.0', '1.0'), 'Basic equality' );
 ok(  versions_equal('1.0', '1.00'), '0 == 00' );

-- 
Debian package checker
Reply to: