Repository: incubator-trafficcontrol Updated Branches: refs/heads/master 3dd9277cc -> 23a4f4952
[TC-502] ORT now skips file checks for remap plugin arguments that start with '-'. ORT parses the remap.config file to find dependent files to update. Since parameters to plugins aren't easily distinguished from options to those plugins, this distinguishes based on the first character. It's not ideal, but it works well in practice. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/b02bdeb3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/b02bdeb3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/b02bdeb3 Branch: refs/heads/master Commit: b02bdeb3583cfb844334553420ed94fb6d042232 Parents: 3dd9277 Author: Chris Lemmons <alfic...@gmail.com> Authored: Tue Aug 8 09:44:08 2017 -0600 Committer: Dan Kirkwood <dang...@gmail.com> Committed: Tue Aug 8 16:34:00 2017 -0600 ---------------------------------------------------------------------- traffic_ops/bin/traffic_ops_ort.pl | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b02bdeb3/traffic_ops/bin/traffic_ops_ort.pl ---------------------------------------------------------------------- diff --git a/traffic_ops/bin/traffic_ops_ort.pl b/traffic_ops/bin/traffic_ops_ort.pl index 209c634..d567849 100755 --- a/traffic_ops/bin/traffic_ops_ort.pl +++ b/traffic_ops/bin/traffic_ops_ort.pl @@ -1267,12 +1267,19 @@ sub check_plugins { foreach my $i ( 1..$#parts ) { ( my $plugin_name, my $plugin_config_file ) = split( /\@pparam\=/, $parts[$i] ); if (defined( $plugin_config_file ) ) { - ($plugin_config_file) = split( /\s+/, $plugin_config_file); - ( my @parts ) = split( /\//, $plugin_config_file ); - $plugin_config_file = $parts[$#parts]; - $plugin_config_file =~ s/\s+//g; - if ( !exists($cfg_file_tracker->{$plugin_config_file}->{'remap_plugin_config_file'} ) && $plugin_config_file !~ /.lua$/ ) { - $cfg_file_tracker->{$plugin_config_file}->{'remap_plugin_config_file'} = 1; + # Subblock for lasting out of. + { + ($plugin_config_file) = split( /\s+/, $plugin_config_file); + + # Skip parameters that start with '-', since those are probabably parameters, not config files. + last if $plugin_config_file =~ m/^-/; # Exit subblock. + + ( my @parts ) = split( /\//, $plugin_config_file ); + $plugin_config_file = $parts[$#parts]; + $plugin_config_file =~ s/\s+//g; + if ( !exists($cfg_file_tracker->{$plugin_config_file}->{'remap_plugin_config_file'} ) && $plugin_config_file !~ /.lua$/ ) { + $cfg_file_tracker->{$plugin_config_file}->{'remap_plugin_config_file'} = 1; + } } } else {
