dg4prez closed pull request #2266: ORT: Removing unnecessary errors
URL: https://github.com/apache/incubator-trafficcontrol/pull/2266
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/traffic_ops/bin/traffic_ops_ort.pl
b/traffic_ops/bin/traffic_ops_ort.pl
index 54b9d0e53..a75326009 100755
--- a/traffic_ops/bin/traffic_ops_ort.pl
+++ b/traffic_ops/bin/traffic_ops_ort.pl
@@ -2651,7 +2651,7 @@ sub open_file_get_contents {
chomp($line);
( $log_level >> $TRACE ) && print "TRACE Line from cfg file on
disk:\t$line.\n";
if ( $line =~ m/^\#/ || $line =~ m/^$/ ) {
- if ( ( $line !~ m/DO NOT EDIT - Generated for / &&
$line !~ m/$header_comment/ ) && $line !~ m/12M NOTE\:/ ) {
+ if ( ( $line !~ m/DO NOT EDIT - Generated for / &&
$line !~ m/$header_comment/ ) && $line !~ m/TRAFFIC OPS NOTE\:/ ) {
next;
}
}
@@ -2710,10 +2710,10 @@ sub diff_file_lines {
}
}
}
- elsif ( ( $line =~ m/DO NOT EDIT - Generated for / &&
$line =~ m/$header_comment/ ) || $line =~ m/12M NOTE\:/ ) {
+ elsif ( ( $line =~ m/DO NOT EDIT - Generated for / &&
$line =~ m/$header_comment/ ) || $line =~ m/TRAFFIC OPS NOTE\:/ ) {
my $found_it = 0;
foreach my $line_disk (@disk_file_lines) {
- if ( ( $line =~ m/DO NOT EDIT -
Generated for / && $line =~ m/$header_comment/ ) || $line =~ m/12M NOTE\:/ ) {
+ if ( ( $line =~ m/DO NOT EDIT -
Generated for / && $line =~ m/$header_comment/ ) || $line =~ m/TRAFFIC OPS
NOTE\:/ ) {
$found_it++;
}
}
@@ -2741,7 +2741,7 @@ sub diff_file_lines {
}
}
}
- elsif ( ( $line =~ m/DO NOT EDIT - Generated for / &&
$line =~ m/$header_comment/ ) || $line =~ m/12M NOTE\:/ ) {
+ elsif ( ( $line =~ m/DO NOT EDIT - Generated for / &&
$line =~ m/$header_comment/ ) || $line =~ m/TRAFFIC OPS NOTE\:/ ) {
next;
}
else {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
