[webui] catch an exception that is not supposed to happen

openSUSE · Nov 9, 2012 · e9a6e0b · e9a6e0b
1 parent 6c148d1
commit e9a6e0b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/webui/app/controllers/package_controller.rb b/src/webui/app/controllers/package_controller.rb
@@ -949,7 +949,11 @@ def live_build_log
         c
       end
     end
-    @initiallog.encode!('UTF-8', invalid: :replace, xml: :text, undef: :replace, cr_newline: true)
+    begin
+      @initiallog.encode!(invalid: :replace, xml: :text, undef: :replace, cr_newline: true)
+    rescue Encoding::UndefinedConversionError 
+      # encode! is documented not to throw it if undef: is :replace, but at least we tried - and ruby 1.9.3 is buggy
+    end
   end