diff options
| -rw-r--r-- | lib/rake.rb | 8 | ||||
| -rw-r--r-- | lib/rake/contrib/ftptools.rb | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/rake.rb b/lib/rake.rb index b46b196878..e597db5eb2 100644 --- a/lib/rake.rb +++ b/lib/rake.rb @@ -1038,7 +1038,7 @@ module FileUtils else begin ln(*args) - rescue StandardError, NotImplementedError => ex + rescue StandardError, NotImplementedError LN_SUPPORTED[0] = false cp(*args) end @@ -1687,7 +1687,7 @@ module Rake end def create_rule(*args, &block) - pattern, arg_names, deps = resolve_args(args) + pattern, _, deps = resolve_args(args) pattern = Regexp.new(Regexp.quote(pattern) + '$') if String === pattern @rules << [pattern, deps, block] end @@ -1795,7 +1795,7 @@ module Rake fail Rake::RuleRecursionOverflowError, "Rule Recursion Too Deep" if level >= 16 @rules.each do |pattern, extensions, block| - if md = pattern.match(task_name) + if pattern.match(task_name) task = attempt_rule(task_name, extensions, block, level) return task if task end @@ -2245,7 +2245,7 @@ module Rake rescue LoadError => ex begin rake_require value - rescue LoadError => ex2 + rescue LoadError raise ex end end diff --git a/lib/rake/contrib/ftptools.rb b/lib/rake/contrib/ftptools.rb index 4c6897f02e..12e4ff25de 100644 --- a/lib/rake/contrib/ftptools.rb +++ b/lib/rake/contrib/ftptools.rb @@ -23,7 +23,7 @@ module Rake # :nodoc: def initialize(path, entry) @path = path - @mode, line, @owner, @group, size, d1, d2, d3, @name = entry.split(' ') + @mode, _, @owner, @group, size, d1, d2, d3, @name = entry.split(' ') @size = size.to_i @time = determine_time(d1, d2, d3) end @@ -57,7 +57,6 @@ module Rake # :nodoc: def determine_time(d1, d2, d3) now = self.class.time.now if /:/ =~ d3 - h, m = d3.split(':') result = Time.parse("#{d1} #{d2} #{now.year} #{d3}") if result > now result = Time.parse("#{d1} #{d2} #{now.year-1} #{d3}") |