comparison lib/redmine/scm/adapters/abstract_adapter.rb @ 922:ad295b270cd4 live

FIx #446: "non-utf8 paths in repositories blow up repo viewer and reposman" by ensuring the iconv conversion always happens even if source and dest are intended to be the same encoding

           self.class.strip_credential(cmd)
         end
 
         def scm_iconv(to, from, str)
           return nil if str.nil?
-          return str if to == from
+          # bug 446: non-utf8 paths in repositories blow up repo viewer and reposman
+          # -- Remove this short-circuit: we want the conversion to
+          #    happen always, so we can trap the error here if the
+          #    source text happens not to be in the advertised
+          #    encoding (instead of having the database blow up later)
+#          return str if to == from
           begin
             Iconv.conv(to, from, str)
           rescue Iconv::Failure => err
             logger.error("failed to convert from #{from} to #{to}. #{err}")
             nil