This is an automated email from the ASF dual-hosted git repository.
dgelinas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 57fc861 Removing ORT ERROR warnign related to TO notes
57fc861 is described below
commit 57fc861108f95d7a1c36bf14372d182fc370895d
Author: Steve Malenfant <steve.malenf...@cox.com>
AuthorDate: Mon May 14 12:51:19 2018 -0400
Removing ORT ERROR warnign related to TO notes
---
traffic_ops/bin/traffic_ops_ort.pl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/traffic_ops/bin/traffic_ops_ort.pl
b/traffic_ops/bin/traffic_ops_ort.pl
index 54b9d0e..a753260 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 {
--
To stop receiving notification emails like this one, please contact
dgeli...@apache.org.
