Fixing tinderbox bustage (removing <Tab>s and adding a "use vars" line)

diff --git a/Bug.pm b/Bug.pm
index 8b4243c25bf4cfeb9192876f5c8c4ab07b6d1e13..ea159ccdc9919f08fcf38b8ad1b9e61dc937c14c 100755 (executable)
--- a/Bug.pm
+++ b/Bug.pm
@@ -27,6 +27,7 @@ use strict;
 
 use DBI;
 use RelationSet;
+use vars qw($unconfirmedstate $legal_keywords);
 require "globals.pl";
 require "CGI.pl";
 package Bug;
@@ -86,7 +87,7 @@ sub initBug  {
   }
   else {
      if ($user_id =~ /^\@/) {
-       $user_id = &::DBname_to_id($user_id); 
+        $user_id = &::DBname_to_id($user_id); 
      }
   }
      
@@ -127,11 +128,11 @@ sub initBug  {
                        "bug_file_loc", "short_desc", "target_milestone",
                        "qa_contact", "status_whiteboard", "creation_ts",
                        "groupset", "delta_ts", "votes") {
-       $fields{$field} = shift @row;
-       if ($fields{$field}) {
-           $self->{$field} = $fields{$field};
-       }
-       $count++;
+        $fields{$field} = shift @row;
+        if ($fields{$field}) {
+            $self->{$field} = $fields{$field};
+        }
+        $count++;
     }
   } else {
     &::SendSQL("select groupset from bugs where bug_id = $bug_id");

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 8b4243c25bf4cfeb9192876f5c8c4ab07b6d1e13..ea159ccdc9919f08fcf38b8ad1b9e61dc937c14c 100755 (executable)
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -27,6 +27,7 @@ use strict;
 
 use DBI;
 use RelationSet;
+use vars qw($unconfirmedstate $legal_keywords);
 require "globals.pl";
 require "CGI.pl";
 package Bug;
@@ -86,7 +87,7 @@ sub initBug  {
   }
   else {
      if ($user_id =~ /^\@/) {
-       $user_id = &::DBname_to_id($user_id); 
+        $user_id = &::DBname_to_id($user_id); 
      }
   }
      
@@ -127,11 +128,11 @@ sub initBug  {
                        "bug_file_loc", "short_desc", "target_milestone",
                        "qa_contact", "status_whiteboard", "creation_ts",
                        "groupset", "delta_ts", "votes") {
-       $fields{$field} = shift @row;
-       if ($fields{$field}) {
-           $self->{$field} = $fields{$field};
-       }
-       $count++;
+        $fields{$field} = shift @row;
+        if ($fields{$field}) {
+            $self->{$field} = $fields{$field};
+        }
+        $count++;
     }
   } else {
     &::SendSQL("select groupset from bugs where bug_id = $bug_id");

diff --git a/Bugzilla/RelationSet.pm b/Bugzilla/RelationSet.pm
index 4b778a6fdbe426aa02d2c6a2aac7e86a52cf1b08..bfd5724009322c12b9a144388505daefa45aa418 100644 (file)
--- a/Bugzilla/RelationSet.pm
+++ b/Bugzilla/RelationSet.pm
@@ -103,8 +103,8 @@ sub generateSqlDeltas {
   if ( $#insertList > -1 ) {
     $sqlInsert = "INSERT INTO $table ($invariantName, $columnName) VALUES " .
       join (",", 
-           map ( "($invariantValue, $_)" , @insertList ) 
-          );
+            map ( "($invariantValue, $_)" , @insertList ) 
+           );
   }
      
   # construct the delete list by seeing which relations exist in the

diff --git a/RelationSet.pm b/RelationSet.pm
index 4b778a6fdbe426aa02d2c6a2aac7e86a52cf1b08..bfd5724009322c12b9a144388505daefa45aa418 100644 (file)
--- a/RelationSet.pm
+++ b/RelationSet.pm
@@ -103,8 +103,8 @@ sub generateSqlDeltas {
   if ( $#insertList > -1 ) {
     $sqlInsert = "INSERT INTO $table ($invariantName, $columnName) VALUES " .
       join (",", 
-           map ( "($invariantValue, $_)" , @insertList ) 
-          );
+            map ( "($invariantValue, $_)" , @insertList ) 
+           );
   }
      
   # construct the delete list by seeing which relations exist in the