aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cask/lib
diff options
context:
space:
mode:
authorMarkus Reiter2017-02-28 16:31:25 +0100
committerMarkus Reiter2017-03-04 01:10:02 +0100
commitc97f8dc8b19ca025378311c4e736172458310f95 (patch)
tree19810d5f8666e5676c53ba5273db7f5f48ce799d /Library/Homebrew/cask/lib
parentfa34aa2a21473a4e4d360e9561f8ca89f2415ded (diff)
downloadbrew-c97f8dc8b19ca025378311c4e736172458310f95.tar.bz2
Merge Plist spec with SystemCommand::Result spec.
Diffstat (limited to 'Library/Homebrew/cask/lib')
-rw-r--r--Library/Homebrew/cask/lib/hbc.rb2
-rw-r--r--Library/Homebrew/cask/lib/hbc/system_command.rb11
2 files changed, 1 insertions, 12 deletions
diff --git a/Library/Homebrew/cask/lib/hbc.rb b/Library/Homebrew/cask/lib/hbc.rb
index 80f1f1da0..c971cbd58 100644
--- a/Library/Homebrew/cask/lib/hbc.rb
+++ b/Library/Homebrew/cask/lib/hbc.rb
@@ -37,8 +37,6 @@ require "hbc/verify"
require "hbc/version"
require "utils"
-require "vendor/plist/plist"
-
module Hbc
include Locations
include Scopes
diff --git a/Library/Homebrew/cask/lib/hbc/system_command.rb b/Library/Homebrew/cask/lib/hbc/system_command.rb
index 06ce276df..f26be8e62 100644
--- a/Library/Homebrew/cask/lib/hbc/system_command.rb
+++ b/Library/Homebrew/cask/lib/hbc/system_command.rb
@@ -1,5 +1,6 @@
require "open3"
require "shellwords"
+require "vendor/plist/plist"
require "extend/io"
@@ -167,16 +168,6 @@ module Hbc
EOS
end
xml
- rescue Plist::ParseError => e
- raise CaskError, <<-EOS
- Error parsing plist output from command.
- command was:
- #{command.utf8_inspect}
- error was:
- #{e}
- output we attempted to parse:
- #{output}
- EOS
end
end
end