Commit 0b990337 authored by mkanat%kerio.com's avatar mkanat%kerio.com

Bug 256513: Fix usage of grep (/$value/, @array);

Patch By Olav Vitters <bugzilla-mozilla@bkor.dhs.org> r=mkanat, a=justdave
parent 675c4bb9
...@@ -312,7 +312,7 @@ sub bz_setup_database { ...@@ -312,7 +312,7 @@ sub bz_setup_database {
my @desired_tables = $self->_bz_schema->get_table_list(); my @desired_tables = $self->_bz_schema->get_table_list();
foreach my $table_name (@desired_tables) { foreach my $table_name (@desired_tables) {
next if grep /^$table_name$/, @current_tables; next if grep($_ eq $table_name, @current_tables);
print "Creating table $table_name ...\n"; print "Creating table $table_name ...\n";
my @table_sql = $self->_bz_schema->get_table_ddl($table_name); my @table_sql = $self->_bz_schema->get_table_ddl($table_name);
......
...@@ -117,7 +117,7 @@ sub getTemplateIncludePath () { ...@@ -117,7 +117,7 @@ sub getTemplateIncludePath () {
# 'en-uk' etc. but not the otherway round. (This is unfortunally # 'en-uk' etc. but not the otherway round. (This is unfortunally
# not very clearly stated in those RFC; see comment just over 14.5 # not very clearly stated in those RFC; see comment just over 14.5
# in http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4) # in http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4)
if(my @found = grep /^$lang(-.+)?$/i, @languages) { if(my @found = grep /^\Q$lang\E(-.+)?$/i, @languages) {
push (@usedlanguages, @found); push (@usedlanguages, @found);
} }
} }
......
...@@ -773,7 +773,7 @@ if ($my_webservergroup && !$silent) { ...@@ -773,7 +773,7 @@ if ($my_webservergroup && !$silent) {
# that we can't chgrp to # that we can't chgrp to
my $webservergid = (getgrnam($my_webservergroup))[2] my $webservergid = (getgrnam($my_webservergroup))[2]
or die("no such group: $my_webservergroup"); or die("no such group: $my_webservergroup");
if ($< != 0 && !grep(/^$webservergid$/, split(" ", $)))) { if ($< != 0 && !grep($_ eq $webservergid, split(" ", $)))) {
print <<EOF; print <<EOF;
Warning: you have entered a value for the "webservergroup" parameter in Warning: you have entered a value for the "webservergroup" parameter in
......
...@@ -422,8 +422,8 @@ for (my $k=1 ; $k <= $bugqty ; $k++) { ...@@ -422,8 +422,8 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
} }
if (defined ($::versions{$product[0]} ) && if (defined ($::versions{$product[0]} ) &&
(my @version = grep /^$bug_fields{'version'}$/i, (my @version = grep(lc($_) eq lc($bug_fields{'version'}),
@{$::versions{$product[0]}}) ){ @{$::versions{$product[0]}})) ){
push (@values, SqlQuote($version[0]) ); push (@values, SqlQuote($version[0]) );
push (@query, "version"); push (@query, "version");
} else { } else {
...@@ -434,7 +434,7 @@ for (my $k=1 ; $k <= $bugqty ; $k++) { ...@@ -434,7 +434,7 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
} }
if (defined ($bug_fields{'priority'}) && if (defined ($bug_fields{'priority'}) &&
(my @priority = grep /^$bug_fields{'priority'}$/i, @::legal_priority) ){ (my @priority = grep(lc($_) eq lc($bug_fields{'priority'}), @::legal_priority)) ){
push (@values, SqlQuote($priority[0]) ); push (@values, SqlQuote($priority[0]) );
push (@query, "priority"); push (@query, "priority");
} else { } else {
...@@ -446,7 +446,7 @@ for (my $k=1 ; $k <= $bugqty ; $k++) { ...@@ -446,7 +446,7 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
} }
if (defined ($bug_fields{'rep_platform'}) && if (defined ($bug_fields{'rep_platform'}) &&
(my @platform = grep /^$bug_fields{'rep_platform'}$/i, @::legal_platform) ){ (my @platform = grep(lc($_) eq lc($bug_fields{'rep_platform'}), @::legal_platform)) ){
push (@values, SqlQuote($platform[0]) ); push (@values, SqlQuote($platform[0]) );
push (@query, "rep_platform"); push (@query, "rep_platform");
} else { } else {
...@@ -459,7 +459,7 @@ for (my $k=1 ; $k <= $bugqty ; $k++) { ...@@ -459,7 +459,7 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
} }
if (defined ($bug_fields{'op_sys'}) && if (defined ($bug_fields{'op_sys'}) &&
(my @opsys = grep /^$bug_fields{'op_sys'}$/i, @::legal_opsys) ){ (my @opsys = grep(lc($_) eq lc($bug_fields{'op_sys'}), @::legal_opsys)) ){
push (@values, SqlQuote($opsys[0]) ); push (@values, SqlQuote($opsys[0]) );
push (@query, "op_sys"); push (@query, "op_sys");
} else { } else {
...@@ -472,8 +472,8 @@ for (my $k=1 ; $k <= $bugqty ; $k++) { ...@@ -472,8 +472,8 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
if (Param("usetargetmilestone")) { if (Param("usetargetmilestone")) {
if (defined ($::target_milestone{$product[0]} ) && if (defined ($::target_milestone{$product[0]} ) &&
(my @tm = grep /^$bug_fields{'target_milestone'}$/i, (my @tm = grep(lc($_) eq lc($bug_fields{'target_milestone'}),
@{$::target_milestone{$product[0]}}) ){ @{$::target_milestone{$product[0]}})) ){
push (@values, SqlQuote($tm[0]) ); push (@values, SqlQuote($tm[0]) );
push (@query, "target_milestone"); push (@query, "target_milestone");
} else { } else {
...@@ -492,8 +492,8 @@ for (my $k=1 ; $k <= $bugqty ; $k++) { ...@@ -492,8 +492,8 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
} }
if (defined ($bug_fields{'bug_severity'}) && if (defined ($bug_fields{'bug_severity'}) &&
(my @severity= grep /^$bug_fields{'bug_severity'}$/i, (my @severity= grep(lc($_) eq lc($bug_fields{'bug_severity'}),
@::legal_severity) ){ @::legal_severity)) ){
push (@values, SqlQuote($severity[0]) ); push (@values, SqlQuote($severity[0]) );
push (@query, "bug_severity"); push (@query, "bug_severity");
} else { } else {
...@@ -543,7 +543,7 @@ for (my $k=1 ; $k <= $bugqty ; $k++) { ...@@ -543,7 +543,7 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
my @resolution; my @resolution;
if (defined ($bug_fields{'resolution'}) && if (defined ($bug_fields{'resolution'}) &&
(@resolution= grep /^$bug_fields{'resolution'}$/i, @::legal_resolution) ){ (@resolution= grep(lc($_) eq lc($bug_fields{'resolution'}), @::legal_resolution)) ){
push (@values, SqlQuote($resolution[0]) ); push (@values, SqlQuote($resolution[0]) );
push (@query, "resolution"); push (@query, "resolution");
} elsif ( (defined $bug_fields{'resolution'}) && (!$resolution[0]) ){ } elsif ( (defined $bug_fields{'resolution'}) && (!$resolution[0]) ){
...@@ -571,7 +571,7 @@ for (my $k=1 ; $k <= $bugqty ; $k++) { ...@@ -571,7 +571,7 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
$bug_fields{'bug_status'}:"unknown"; $bug_fields{'bug_status'}:"unknown";
$err .= "\".\n"; $err .= "\".\n";
} elsif (defined ($bug_fields{'bug_status'}) && } elsif (defined ($bug_fields{'bug_status'}) &&
(my @status = grep /^$bug_fields{'bug_status'}$/i, @::legal_bug_status) ){ (my @status = grep(lc($_) eq lc($bug_fields{'bug_status'}), @::legal_bug_status)) ){
#if a bug status was set then use it, if its legal #if a bug status was set then use it, if its legal
push (@values, SqlQuote($status[0])); push (@values, SqlQuote($status[0]));
push (@query, "bug_status"); push (@query, "bug_status");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment