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

[SCM] Debian package checker branch, master, updated. 2.5.12-75-g9830f5c



The following commit has been merged in the master branch:
commit 9830f5c92bfaf8e8729d11101e5acdd14f6b8ecd
Author: Niels Thykier <niels@thykier.net>
Date:   Thu May 9 23:40:11 2013 +0200

    Use q{} instead of "" for strings with a single quote in it
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/.perlcriticrc b/.perlcriticrc
index b3bd626..5888d47 100644
--- a/.perlcriticrc
+++ b/.perlcriticrc
@@ -41,7 +41,6 @@ functions = open opendir chdir read readdir readline closedir sysopen sysread sy
 [-Modules::ProhibitExcessMainComplexity]
 
 [ValuesAndExpressions::ProhibitInterpolationOfLiterals]
-allow_if_string_contains_single_quote = 1
 
 [ValuesAndExpressions::ProhibitCommaSeparatedStatements]
 allow_last_statement_to_be_comma_separated_in_map_and_grep = 1
diff --git a/checks/deb-format b/checks/deb-format
index 5e53853..47a41e3 100644
--- a/checks/deb-format
+++ b/checks/deb-format
@@ -83,7 +83,7 @@ if ($okay) {
     $opts = {};
     $success = spawn ($opts, ['ar', 'p', $deb, 'debian-binary']);
     if (not $success) {
-        tag 'malformed-deb-archive', "can't read debian-binary member";
+        tag 'malformed-deb-archive', 'cannot read debian-binary member';
     } elsif (${ $opts->{out} } !~ /^2\.\d+\n/) {
         my ($version) = split("\n", ${ $opts->{out} });
         tag 'malformed-deb-archive', "version $version not 2.0";
diff --git a/lib/Lintian/Lab/Manifest.pm b/lib/Lintian/Lab/Manifest.pm
index 9a54294..ade8648 100644
--- a/lib/Lintian/Lab/Manifest.pm
+++ b/lib/Lintian/Lab/Manifest.pm
@@ -75,9 +75,9 @@ differ between package types.
 
 # these banner lines have to be changed with every incompatible change of the
 # binary and source list file formats
-use constant BINLIST_FORMAT => "Lintian's list of binary packages in the archive--V5";
-use constant SRCLIST_FORMAT => "Lintian's list of source packages in the archive--V5";
-use constant CHGLIST_FORMAT => "Lintian's list of changes packages in the archive--V1";
+use constant BINLIST_FORMAT => q{Lintian's list of binary packages in the archive--V5};
+use constant SRCLIST_FORMAT => q{Lintian's list of source packages in the archive--V5};
+use constant CHGLIST_FORMAT => q{Lintian's list of changes packages in the archive--V1};
 
 # List of fields in the formats and the order they appear in
 #  - for internal usage to read and write the files
diff --git a/lib/Lintian/Output/XML.pm b/lib/Lintian/Output/XML.pm
index 5fd7bcb..4aeb467 100644
--- a/lib/Lintian/Output/XML.pm
+++ b/lib/Lintian/Output/XML.pm
@@ -100,7 +100,7 @@ sub _make_xml_tag {
     my $empty = ($content//'') eq '' && (!defined $children || !@$children);
     my $output = $self->_open_xml_tag($tag, $attrs, $empty);
     if (!$empty) {
-        $output .= encode_entities($content,"<>&\"'") if $content;
+        $output .= encode_entities($content, q{<>&"'}) if $content;
         if (defined $children) {
             foreach my $child (@$children) {
                 $output .= "\n\t$child";
diff --git a/t/scripts/Lintian/DepMap/06parents.t b/t/scripts/Lintian/DepMap/06parents.t
index 7f4c962..9efb615 100644
--- a/t/scripts/Lintian/DepMap/06parents.t
+++ b/t/scripts/Lintian/DepMap/06parents.t
@@ -12,5 +12,5 @@ $map->add('A');
 $map->add('B', 'A');
 
 my @parents;
-ok(eval {@parents = $map->parents('B'); }, "Get B's parents");
-is_deeply(\@parents, ['A'], "B's parent is A");
+ok(eval {@parents = $map->parents('B'); }, q{Get B's parents});
+is_deeply(\@parents, ['A'], q{B's parent is A});
diff --git a/t/scripts/Lintian/DepMap/09unlink.t b/t/scripts/Lintian/DepMap/09unlink.t
index 33d4a08..fe775b9 100644
--- a/t/scripts/Lintian/DepMap/09unlink.t
+++ b/t/scripts/Lintian/DepMap/09unlink.t
@@ -41,7 +41,7 @@ $map->add('A', 'B');
 $map->add('B');
 
 $map->unlink('B', 'soft');
-ok(!$map->satisfy('A'), "A can't be satisfied because it depends on the soft-unlinked B");
+ok(!$map->satisfy('A'), 'A cannot be satisfied because it depends on the soft-unlinked B');
 
 TODO: {
     local $TODO = 'When re-adding B there are still references to the old B, and old $B != new $B';

-- 
Debian package checker


Reply to: