]> source.dussan.org Git - redmine.git/commitdiff
fix Ruby 2.2 warning at lib/redmine/scm/adapters/cvs_adapter.rb
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sat, 3 Jan 2015 17:31:01 +0000 (17:31 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sat, 3 Jan 2015 17:31:01 +0000 (17:31 +0000)
On ruby 2.2.0p0 (2014-12-25 revision 49005) [x86_64-linux]:

<pre>
lib/redmine/scm/adapters/cvs_adapter.rb:342:
  warning: Comparable#== will no more rescue exceptions of #<=> in the next release.
lib/redmine/scm/adapters/cvs_adapter.rb:342:
  warning: Return nil in #<=> if the comparison is inappropriate or avoid such comparison.
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@13831 e93f8b46-1217-0410-a6f0-8f06a7374b81

lib/redmine/scm/adapters/cvs_adapter.rb

index ec7ce7bcf9db81a473a634f8d27a422aa3087074..92be4389e7ce40833893ff1d6e761e898c93ee70 100644 (file)
@@ -339,7 +339,7 @@ module Redmine
         # convert a date/time into the CVS-format
         def time_to_cvstime(time)
           return nil if time.nil?
-          time = Time.now if time == 'HEAD'
+          time = Time.now if (time.kind_of?(String) && time == 'HEAD')
 
           unless time.kind_of? Time
             time = Time.parse(time)