[Reproducible-commits] [dpkg] 69/105: perl: Fix various perl critic regressions

[Niko Tyni]

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

ntyni pushed a commit to branch ntyni/reproducible_builds
in repository dpkg.

commit 7fdaf8df9877bd6516b4c1ff027b96a3936f456c
Author: Guillem Jover <guillem at debian.org>
Date:   Sat Apr 2 21:07:37 2016 +0200

    perl: Fix various perl critic regressions
---
 lib/dpkg/t/t-tree.t          |  2 +-
 lib/dpkg/t/t-trigdeferred.t  | 10 +++++-----
 scripts/Dpkg/Arch.pm         |  2 +-
 scripts/Dpkg/Source/Patch.pm |  4 ++--
 scripts/dpkg-source.pl       |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/dpkg/t/t-tree.t b/lib/dpkg/t/t-tree.t
index 1622129..c4189a4 100755
--- a/lib/dpkg/t/t-tree.t
+++ b/lib/dpkg/t/t-tree.t
@@ -124,7 +124,7 @@ sub test_treewalker {
 
         find({ no_chdir => 1, wanted => sub {
                    return if $type eq 'skip' and m{^\Q$dirtree\E/cccc};
-                   push @paths, $_ =~ s{\./}{}r;
+                   push @paths, s{\./}{}r;
                },
              }, $dirtree);
 
diff --git a/lib/dpkg/t/t-trigdeferred.t b/lib/dpkg/t/t-trigdeferred.t
index 6cded31..21da412 100755
--- a/lib/dpkg/t/t-trigdeferred.t
+++ b/lib/dpkg/t/t-trigdeferred.t
@@ -109,13 +109,13 @@ sub test_trigdeferred {
               nocheck => 1, to_string => \$stdout, error_to_string => \$stderr);
         my $exitcode = $? >> 8;
 
-        is($exitcode, $test->{exitcode}, "trigger deferred expected exitcode");
+        is($exitcode, $test->{exitcode}, 'trigger deferred expected exitcode');
         if ($test->{exitcode} == 0) {
-            is($stderr, '', "trigger deferred expected stderr");
-            is($stdout, $test->{expected}, "trigger deferred expected stdout");
+            is($stderr, '', 'trigger deferred expected stderr');
+            is($stdout, $test->{expected}, 'trigger deferred expected stdout');
         } else {
-            isnt($stderr, '', "trigger deferred expected stderr");
-            isnt($stdout, undef, "trigger deferred expected stdout");
+            isnt($stderr, '', 'trigger deferred expected stderr');
+            isnt($stdout, undef, 'trigger deferred expected stdout');
         }
     }
 }
diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm
index 04b8574..553054f 100644
--- a/scripts/Dpkg/Arch.pm
+++ b/scripts/Dpkg/Arch.pm
@@ -545,7 +545,7 @@ sub debarch_is_illegal
 {
     my ($arch) = @_;
 
-    return $arch !~ m/^(!?[a-zA-Z0-9][a-zA-Z0-9-]*)$/;
+    return $arch !~ m/^!?[a-zA-Z0-9][a-zA-Z0-9-]*$/;
 }
 
 =item $bool = debarch_is_concerned($arch, @arches)
diff --git a/scripts/Dpkg/Source/Patch.pm b/scripts/Dpkg/Source/Patch.pm
index 8d759af..ee5e114 100644
--- a/scripts/Dpkg/Source/Patch.pm
+++ b/scripts/Dpkg/Source/Patch.pm
@@ -495,8 +495,8 @@ sub analyze {
 
             if ($opts{fatal_dupes}) {
                 error(g_("diff '%s' patches files multiple times; split the " .
-                         "diff in multiple files or merge the hunks into a " .
-                         "single one"), $diff);
+                         'diff in multiple files or merge the hunks into a ' .
+                         'single one'), $diff);
             } elsif ($opts{verbose} and $filepatched{$fn} == 2) {
                 warning(g_("diff '%s' patches file %s more than once"), $diff, $fn)
             }
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 1cde71c..75b7726 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -551,12 +551,12 @@ sub get_format_help {
     if ($help_build) {
         $help .= "\n";
         $help .= "Build format $build_format options:\n";
-        $help .= $help_build || g_("<none>");
+        $help .= $help_build || g_('<none>');
     }
     if ($help_extract) {
         $help .= "\n";
         $help .= "Extract format $build_format options:\n";
-        $help .= $help_extract || g_("<none>");
+        $help .= $help_extract || g_('<none>');
     }
 
     return $help;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git