Skip to content

Commit

Permalink
Merge pull request #4889 from rolandwalker/plist_parse_updates
Browse files Browse the repository at this point in the history
Plist parse updates
  • Loading branch information
rolandwalker committed Jun 15, 2014
2 parents 85cc3f9 + d61f165 commit edf513e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion lib/cask/system_command.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,13 @@ def self._parse_plist(command, output)
raise Plist::ParseError "Empty XML output"
end
xml
rescue Plist::ParseError
rescue Plist::ParseError => e
raise CaskError.new(<<-ERRMSG)
Error parsing plist output from command.
command was:
#{command.utf8_inspect}
error was:
#{e}
output we attempted to parse:
#{output}
ERRMSG
Expand Down
2 changes: 1 addition & 1 deletion lib/plist/parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module Plist
# + Date elements are returned as DateTime objects.
# + Data elements are implemented as Tempfiles
#
# Plist::parse_xml will blow up if it encounters a data element.
# Plist::parse_xml will blow up if it encounters a Date element.
# If you encounter such an error, or if you have a Date element which
# can't be parsed into a Time object, please send your plist file to
# [email protected] so that I can implement the proper support.
Expand Down

0 comments on commit edf513e

Please sign in to comment.