Changeset 36808 for other-projects/nightly-tasks/diffcol
- Timestamp:
- 2022-10-16T18:52:02+13:00 (19 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
other-projects/nightly-tasks/diffcol/trunk/diffcol/cfgdiff.pm
r21711 r36808 21 21 if($cfg_file eq "build.cfg") 22 22 { 23 my @temp_array = split (" ",$cfg_result);24 my @r_array = grep {/\d+/} @temp_array;23 my @temp_array = split (" ",$cfg_result); 24 my @r_array = grep {/\d+/} @temp_array; 25 25 26 if ($cfg_result eq "")27 {28 29 # return "Difference Report: These two collections are identical";30 }31 elsif ($r_array[1] > $r_array[2] && $temp_array[2] eq "builddate" && $temp_array[6] eq "builddate")32 {33 34 }35 elsif ($r_array[1] < $r_array[2] && $temp_array[2] eq "builddate" && $temp_array[6] eq "builddate")36 {37 38 }39 else40 {41 42 43 }26 if ($cfg_result eq "") 27 { 28 return ""; 29 # return "Difference Report: These two collections are identical"; 30 } 31 elsif ($r_array[1] > $r_array[2] && $temp_array[2] eq "builddate" && $temp_array[6] eq "builddate") 32 { 33 return "Difference Report: Using newer collection as model collection"; 34 } 35 elsif ($r_array[1] < $r_array[2] && $temp_array[2] eq "builddate" && $temp_array[6] eq "builddate") 36 { 37 return ""; 38 } 39 else 40 { 41 $cfg_result = &diffutil::GenerateOutput($cfg_result,""); 42 return $cfg_result; 43 } 44 44 } 45 45 elsif($cfg_file eq "collect.cfg") 46 46 { 47 47 48 $cfg_result = &diffutil::GenerateOutput($cfg_result,"");49 if ($cfg_result eq "")50 {51 52 }53 else54 {55 56 }48 $cfg_result = &diffutil::GenerateOutput($cfg_result,""); 49 if ($cfg_result eq "") 50 { 51 return ""; 52 } 53 else 54 { 55 return "Difference Report:\n$cfg_result"; 56 } 57 57 } 58 58 else 59 59 { 60 die "Error occour in cfgdiff::testcfg!!\n";60 die "Error occour in cfgdiff::testcfg!!\n"; 61 61 } 62 62 }
Note:
See TracChangeset
for help on using the changeset viewer.