This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit d30158b4ee24b587c5780cab4529e6d0ae2e42f6 Author: Sebb <[email protected]> AuthorDate: Tue Sep 29 22:24:36 2020 +0100 Unnecessary --- lib/whimsy/asf/config.rb | 4 ++-- lib/whimsy/logparser.rb | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/whimsy/asf/config.rb b/lib/whimsy/asf/config.rb index 8aa9e16..f2998ab 100644 --- a/lib/whimsy/asf/config.rb +++ b/lib/whimsy/asf/config.rb @@ -96,7 +96,7 @@ module ASF lib = File.realpath(lib) ENV['RUBYLIB'] = ([lib] + ENV['RUBYLIB'].to_s.split(':')).uniq.join(':') - $LOAD_PATH.unshift lib.untaint unless $LOAD_PATH.include? lib + $LOAD_PATH.unshift lib unless $LOAD_PATH.include? lib end # Look up a configuration value by name (generally a symbol, like @@ -114,7 +114,7 @@ module ASF # Set a local directory corresponding to a path # Useful as a test data override. def self.[]=(name, path) - @testdata[name] = File.expand_path(path).untaint + @testdata[name] = File.expand_path(path) end def self.root diff --git a/lib/whimsy/logparser.rb b/lib/whimsy/logparser.rb index 515adee..a24ddac 100755 --- a/lib/whimsy/logparser.rb +++ b/lib/whimsy/logparser.rb @@ -169,7 +169,7 @@ module LogParser # @return hash of arrays of interesting entries def parse_error_logs(d = ERROR_LOG_DIR, logs = {}) Dir[File.join(d, 'error?lo*')].each do |f| - parse_error_log(f.untaint, logs) + parse_error_log(f, logs) end return logs end @@ -201,7 +201,7 @@ module LogParser # @return hash of arrays of interesting entries def parse_whimsy_errors(d = ERROR_LOG_DIR, logs = {}) Dir[File.join(d, 'whimsy_error.lo*')].each do |f| - parse_whimsy_error(f.untaint, logs) + parse_whimsy_error(f, logs) end return logs end @@ -211,10 +211,9 @@ module LogParser # @param d directory to scan for *error.log* # @return hash of arrays of interesting entries def get_errors(current, dir: ERROR_LOG_DIR) - dir.untaint if current logs = LogParser.parse_whimsy_error(File.join(dir, 'whimsy_error.log')) - error_log = Dir[File.join(dir, 'error?log')].first.untaint + error_log = Dir[File.join(dir, 'error?log')].first LogParser.parse_error_log(error_log, logs) if error_log else logs = LogParser.parse_whimsy_errors(dir)
