Changeset 36809

Timestamp:

2022-10-16T18:57:16+13:00 (19 months ago)

Author:

anupama

Message:

Accidentally committed changes that were just tabbing etc. Undoing commit 36808 following ​https://stackoverflow.com/questions/13330011/how-do-i-revert-an-svn-commit

File:

• other-projects/nightly-tasks/diffcol/trunk/diffcol/cfgdiff.pm (modified) (1 diff)

other-projects/nightly-tasks/diffcol/trunk/diffcol/cfgdiff.pm

@@ -21 +21 @@
     if($cfg_file eq "build.cfg")
     {
-        my @temp_array = split (" ",$cfg_result);
-        my @r_array =  grep {/\d+/} @temp_array;
+    my @temp_array = split (" ",$cfg_result);
+    my @r_array =  grep {/\d+/} @temp_array;
 
-        if ($cfg_result eq "")
-        {
-            return "";
-    #       return "Difference Report: These two collections are identical";
-        }
-        elsif ($r_array[1] > $r_array[2] && $temp_array[2] eq "builddate" && $temp_array[6] eq "builddate")
-        {
-            return "Difference Report: Using newer collection as model collection";
-        }
-        elsif ($r_array[1] < $r_array[2] && $temp_array[2] eq "builddate" && $temp_array[6] eq "builddate")
-        {
-            return "";
-        }
-        else
-        {
-            $cfg_result = &diffutil::GenerateOutput($cfg_result,"");
-            return $cfg_result;
-        }
+    if ($cfg_result eq "")
+    {
+        return "";
+#       return "Difference Report: These two collections are identical";
+    }
+    elsif ($r_array[1] > $r_array[2] && $temp_array[2] eq "builddate" && $temp_array[6] eq "builddate")
+    {
+        return "Difference Report: Using newer collection as model collection";
+    }
+    elsif ($r_array[1] < $r_array[2] && $temp_array[2] eq "builddate" && $temp_array[6] eq "builddate")
+    {
+        return "";
+    }
+    else
+    {
+        $cfg_result = &diffutil::GenerateOutput($cfg_result,"");
+        return $cfg_result;
+    }
     }
     elsif($cfg_file eq "collect.cfg")
     {
 
-        $cfg_result = &diffutil::GenerateOutput($cfg_result,"");
-        if ($cfg_result eq "")
-        {
-            return "";
-        }
-        else
-        {
-            return "Difference Report:\n$cfg_result";
-        }
+    $cfg_result = &diffutil::GenerateOutput($cfg_result,"");
+    if ($cfg_result eq "")
+    {
+        return "";
+    }
+    else
+    {
+        return "Difference Report:\n$cfg_result";
+    }
     }
     else
     {
-        die "Error occour in cfgdiff::testcfg!!\n";
+    die "Error occour in cfgdiff::testcfg!!\n";
     }
 }