Force pkginfo file string to UTF-8

treydock · Feb 16, 2012 · dd8f3c0 · dd8f3c0
1 parent 7a306d5
commit dd8f3c0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/models/package.rb b/app/models/package.rb
@@ -824,9 +824,9 @@ def self.process_pkginfo_file(pkginfo_file,package_file,options)
 
       # Parse plist
       begin
-        pkginfo_hash = Plist.parse_xml(pkginfo_file.read)
-      rescue RuntimeError => e
-        raise PackageError.new("Unable to parse pkginfo file -- Plist.parse_xml raised RuntimeError: #{e}")
+        pkginfo_hash = Plist.parse_xml(pkginfo_file.read.to_utf8)
+      rescue Exception => e
+        raise PackageError.new("Unable to parse pkginfo file -- Plist.parse_xml raised an exception: #{e}")
       end
 
       # Make sure pkginfo_hash isn't nil