From 5163904a3a8550c33257cadc2966378378a79776 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 11 Apr 2010 13:55:30 +0000
Subject: [PATCH] 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
---
 app/models/changeset.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 0ed5e1661..3bd26b111 100644
--- 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