perl: Unify regex delimiters to //, {} or <>

Fixes RegularExpressions::ProhibitUnusualDelimiters.

Warned-by: perlcritic

10 files changed, 20 insertions, 16 deletions

diff --git a/dselect/methods/Dselect/Ftp.pm b/dselect/methods/Dselect/Ftp.pm
index 6d6376047..930564c34 100644
--- a/dselect/methods/Dselect/Ftp.pm
+++ b/dselect/methods/Dselect/Ftp.pm
@@ -109,7 +109,7 @@ sub edit_config {
     do {
          edit_site($config{site}[$1 - 1]) if ($1 <= @{$config{site}});
          next; };
-    m#m#i && view_mirrors();
+    /m/i && view_mirrors();
   }
 
   print "\n";
diff --git a/dselect/methods/ftp/install b/dselect/methods/ftp/install
index 25b8378ec..d7e13ce0f 100755
--- a/dselect/methods/ftp/install
+++ b/dselect/methods/ftp/install
@@ -328,9 +328,9 @@ sub download() {
     foreach (@{$site->[2]}) {
       $cp++;
       $pre_dist[$cp] = '';
-      $n = (s#\.\./#../#g);
+      $n = (s{\.\./}{../}g);
       next if (! $n);
-      if (m#^((?:\.\./){$n}(?:[^/]+/){$n})#) {
+      if (m<^((?:\.\./){$n}(?:[^/]+/){$n})>) {
         $pre_dist[$cp] = $1;
       }
     }
@@ -369,7 +369,7 @@ sub download() {
 	    } else {
               #Try to find another file or this package
 	      print "Looking for another version of the package...\n";
-	      my ($dir,$package) = ($fn =~ m#^(.*)/([^/]+)_[^/]+.deb$#);
+	      my ($dir, $package) = ($fn =~ m{^(.*)/([^/]+)_[^/]+.deb$});
 	      my $protected = $package;
 	      $protected =~ s/\+/\\\+/g;
 	      my $list = $ftp->ls("$pre$dir");
diff --git a/dselect/mkcurkeys.pl b/dselect/mkcurkeys.pl
index 882fa1fc8..1cc0052d7 100755
--- a/dselect/mkcurkeys.pl
+++ b/dselect/mkcurkeys.pl
@@ -59,7 +59,7 @@ while (<$header_fh>) {
     $_= $rhs;
     s/(\w)[\(\)]/$1/g;
     s/\w+ \((\w+)\)/$1/;
-    next unless m|^/\* (\w[\w ]+\w) \*/$|;
+    next unless m{^/\* (\w[\w ]+\w) \*/$};
     $_= $1;
     s/ key$//;
     next if s/^shifted /shift / ? m/ .* .* / : m/ .* /;
diff --git a/scripts/Dpkg.pm b/scripts/Dpkg.pm
index ba41ede34..6fdc78c76 100644
--- a/scripts/Dpkg.pm
+++ b/scripts/Dpkg.pm
@@ -21,7 +21,7 @@ our $VERSION = '1.00';
 use base qw(Exporter);
 our @EXPORT = qw($version $progname $admindir $dpkglibdir $pkgdatadir);
 
-our ($progname) = $0 =~ m#(?:.*/)?([^/]*)#;
+our ($progname) = $0 =~ m{(?:.*/)?([^/]*)};
 
 # The following lines are automatically fixed at install time
 our $version = '1.17.x';
diff --git a/scripts/Dpkg/Changelog/Debian.pm b/scripts/Dpkg/Changelog/Debian.pm
index f308c8307..5d6f1cc06 100644
--- a/scripts/Dpkg/Changelog/Debian.pm
+++ b/scripts/Dpkg/Changelog/Debian.pm
@@ -109,7 +109,7 @@ sub parse {
 	    next; # skip stuff that look like a CVS keyword
 	} elsif (m/^\# /o) {
 	    next; # skip comments, even that's not supported
-	} elsif (m,^/\*.*\*/,o) {
+	} elsif (m{^/\*.*\*/}o) {
 	    next; # more comments
 	} elsif (m/^(\w+\s+\w+\s+\d{1,2} \d{1,2}:\d{1,2}:\d{1,2}\s+[\w\s]*\d{4})\s+(.*)\s+(<|\()(.*)(\)|>)/o
 		 || m/^(\w+\s+\w+\s+\d{1,2},?\s*\d{4})\s+(.*)\s+(<|\()(.*)(\)|>)/o
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index 37bf7e9f8..1dec6e519 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -101,7 +101,7 @@ sub load_override
 		    my $oldmaint = $1;
 		    my $newmaint = $2;
 		    my $debmaint = $$package{Maintainer};
-		    if (!grep($debmaint eq $_, split(m:\s*//\s*:, $oldmaint))) {
+		    if (!grep($debmaint eq $_, split(m{\s*//\s*}, $oldmaint))) {
 			push(@changedmaint,
 			     sprintf(_g('  %s (package says %s, not %s)'),
 			             $p, $$package{Maintainer}, $oldmaint));
diff --git a/scripts/dpkg-scansources.pl b/scripts/dpkg-scansources.pl
index a0432d65c..7045738ed 100755
--- a/scripts/dpkg-scansources.pl
+++ b/scripts/dpkg-scansources.pl
@@ -141,7 +141,7 @@ sub load_override {
 	    # do nothing
 	}
 	elsif ($maintainer =~ /^(.*\S)\s*=>\s*(.*)$/) {
-	    $Override{$package}[O_MAINT_FROM] = [split m-\s*//\s*-, $1];
+	    $Override{$package}[O_MAINT_FROM] = [split m{\s*//\s*}, $1];
 	    $Override{$package}[O_MAINT_TO] = $2;
 	}
 	else {
@@ -225,7 +225,7 @@ sub process_dsc {
     my $basename = $file;
     my $dir = ($basename =~ s{^(.*)/}{}) ? $1 : '';
     $dir = "$prefix$dir";
-    $dir =~ s-/+$--;
+    $dir =~ s{/+$}{};
     $dir = '.' if $dir eq '';
 
     # Parse ‘.dsc’ file.
@@ -313,7 +313,7 @@ sub main {
         or syserr(_g('cannot fork for %s'), 'find');
     while (<$find_fh>) {
     	chomp;
-	s-^\./+--;
+	s{^\./+}{};
 
         my $fields;
 
diff --git a/src/t/100_dpkg_divert.t b/src/t/100_dpkg_divert.t
index 2e798075f..7a04d3cf8 100644
--- a/src/t/100_dpkg_divert.t
+++ b/src/t/100_dpkg_divert.t
@@ -275,7 +275,7 @@ install_diversions('');
 
 system("touch $testdir/foo");
 call_divert(['--rename', '--add', "$testdir/foo"],
-            expect_stdout_like => qr,Adding.*local.*diversion.*\Q$testdir\E/foo.*\Q$testdir\E/foo.distrib,,
+            expect_stdout_like => qr{Adding.*local.*diversion.*\Q$testdir\E/foo.*\Q$testdir\E/foo.distrib},
             expect_stderr => '');
 ok(-e "$testdir/foo.distrib", 'foo diverted');
 ok(!-e "$testdir/foo", 'foo diverted');
@@ -289,7 +289,7 @@ install_diversions('');
 
 system("touch $testdir/foo");
 call_divert(['--add', "$testdir/foo"],
-            expect_stdout_like => qr,Adding.*local.*diversion.*\Q$testdir\E/foo.*\Q$testdir\E/foo.distrib,,
+            expect_stdout_like => qr{Adding.*local.*diversion.*\Q$testdir\E/foo.*\Q$testdir\E/foo.distrib},
             expect_stderr => '');
 ok(!-e "$testdir/foo.distrib", 'foo diverted');
 ok(-e "$testdir/foo", 'foo diverted');
@@ -465,7 +465,7 @@ call_divert(['--package', 'baz', '--divert', "$testdir/foo.my", '--remove', "$te
             expect_failure => 1, expect_stderr_like =>qr/mismatch on (package|divert-to)/);
 
 call_divert(['--divert', "$testdir/foo.distrib", '--remove', "$testdir/foo"],
-            expect_stdout_like => qr,Removing.*\Q$testdir\E/foo,);
+            expect_stdout_like => qr{Removing.*\Q$testdir\E/foo});
 diversions_eq(<<"EOF");
 $testdir/bar
 $testdir/bar.distrib
@@ -486,7 +486,7 @@ call_divert(["$testdir/bar"]);
 call_divert(["$testdir/baz"]);
 
 call_divert(['--remove', "$testdir/bar"],
-            expect_stdout_like => qr,Removing.*\Q$testdir\E/bar,);
+            expect_stdout_like => qr{Removing.*\Q$testdir\E/bar});
 diversions_eq(<<"EOF");
 $testdir/foo
 $testdir/foo.distrib
@@ -526,7 +526,7 @@ system("touch $testdir/foo");
 call_divert(['--rename', "$testdir/foo"]);
 
 call_divert(['--test', '--rename', '--remove', "$testdir/foo"],
-            expect_stdout_like => qr,Removing.*\Q$testdir\E/foo,, expect_stderr => '');
+            expect_stdout_like => qr{Removing.*\Q$testdir\E/foo}, expect_stderr => '');
 ok(-e "$testdir/foo.distrib");
 ok(!-e "$testdir/foo");
 diversions_eq($diversions_added_foo_local);
diff --git a/test/100_critic.t b/test/100_critic.t
index 898b911da..fda442b7e 100644
--- a/test/100_critic.t
+++ b/test/100_critic.t
@@ -68,6 +68,7 @@ my @policies = qw(
     Modules::RequireExplicitPackage
     Modules::RequireFilenameMatchesPackage
     Objects::ProhibitIndirectSyntax
+    RegularExpressions::ProhibitUnusualDelimiters
     RegularExpressions::RequireBracesForMultiline
     Subroutines::ProhibitExplicitReturnUndef
     Subroutines::ProhibitNestedSubs
diff --git a/test/100_critic/perlcriticrc b/test/100_critic/perlcriticrc
index 8fa73d6f9..9a68f343e 100644
--- a/test/100_critic/perlcriticrc
+++ b/test/100_critic/perlcriticrc
@@ -2,6 +2,9 @@
 severity = 1
 verbose = %f %l:%c (Severity: %s)\n  %P (%s)\n  near '%r'\n%d\n
 
+[RegularExpressions::ProhibitUnusualDelimiters]
+allow_all_brackets = 1
+
 #[RegularExpressions::RequireExtendedFormatting]
 #minimum_regex_length_to_complain_about = 60