Fixed: Update of Subversion changesets broken by r3466 under Solaris (#5255).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3635 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-11 13:55:30 +00:00 · 2010-04-11 13:55:30 +00:00 · 5163904a3a
parent 9306f3ea6c
commit 5163904a3a
1 changed files with 6 additions and 1 deletions
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@ -191,6 +191,11 @@ class Changeset < ActiveRecord::Base
      end
    end
    # removes invalid UTF8 sequences
-    Iconv.conv('UTF-8//IGNORE', 'UTF-8', str + '  ')[0..-3]
+    begin
+      Iconv.conv('UTF-8//IGNORE', 'UTF-8', str + '  ')[0..-3]
+    rescue Iconv::InvalidEncoding
+      # "UTF-8//IGNORE" is not supported on some OS
+      str
+    end
  end
 end