[Rt-commit] rt branch, 3.8/perlcritic, updated. rt-3.8.10-222-ge5b6f81

[Alex Vandiver]

The branch, 3.8/perlcritic has been updated
       via  e5b6f812d9e91cc2b2862c8004da4241a1e4f8fa (commit)
       via  61a8fd0559540dc070044e0a78fed48ca3852364 (commit)
      from  f93d2c578dde14dc09d9bd26bce00f104b0c7927 (commit)

Summary of changes:
 etc/upgrade/split-out-cf-categories.in |    4 ++--
 lib/RT/CustomField_Overlay.pm          |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 61a8fd0559540dc070044e0a78fed48ca3852364
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Sep 15 14:54:51 2011 -0400

    Set $^W to a defined value, for warnings avoidance

diff --git a/lib/RT/CustomField_Overlay.pm b/lib/RT/CustomField_Overlay.pm
index ef0d4fc..609db30 100755
--- a/lib/RT/CustomField_Overlay.pm
+++ b/lib/RT/CustomField_Overlay.pm
@@ -639,7 +639,7 @@ sub _IsValidRegex {
     my $self  = shift;
     my $regex = shift or return (1, 'valid');
 
-    local $^W = undef; local $@ = undef;
+    local $^W = 0; local $@ = undef;
     local $SIG{__DIE__} = sub { 1 };
     local $SIG{__WARN__} = sub { 1 };
 

commit e5b6f812d9e91cc2b2862c8004da4241a1e4f8fa
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Nov 2 13:27:45 2011 -0400

    Use <STDIN> rather than <>, in case of @ARGV

diff --git a/etc/upgrade/split-out-cf-categories.in b/etc/upgrade/split-out-cf-categories.in
index fb7061e..6704d45 100644
--- a/etc/upgrade/split-out-cf-categories.in
+++ b/etc/upgrade/split-out-cf-categories.in
@@ -84,11 +84,11 @@ while (my $cf  = $CFs->Next ) {
     print "  $_\n" for @categories;
 
     print "Split this CF's categories into a hierarchical custom field (Y/n)? ";
-    my $dothis = <>;
+    my $dothis = <STDIN>;
     next if $dothis =~ /n/i;
 
     print "Enter name of CF to create as category ('@{[$cf->Name]} category'): ";
-    my $newname = <>;
+    my $newname = <STDIN>;
     chomp $newname;
     $newname = $cf->Name . " category" unless length $newname;
 

-----------------------------------------------------------------------