lib/d3/package/client_actions.rb in depot3-3.0.7 vs lib/d3/package/client_actions.rb in depot3-3.0.8
- old
+ new
@@ -174,11 +174,11 @@
# if this was a puppy install, remove it from the queue
D3::PUPPY_Q - @basename
return pre_install_status
elsif pre_install_status != 0 then
D3.log "Pre_install script for #{edition} failed, exit status: #{pre_install_status}, not installing.", :error
- raise D3::InstallError, "Pre_install script for #{edition} failed, exit status: #{pre_install_status}, not installing."
+ raise D3::PreInstallError, "Pre_install script for #{edition} failed, exit status: #{pre_install_status}, not installing."
end # pre_install_status == 111
# if forced, make the os forget this has been installed before
if forced and @apple_receipt_data.is_a? Array
@apple_receipt_data.each do |r|
@@ -204,10 +204,10 @@
# run a postflight if needed
post_install_status = run_post_install_script(args[:verbose])
if post_install_status != 0
D3.log "Post_install script for #{edition} failed, exit status: #{post_install_status}", :error
- raise D3::ScriptError, "Post_install script for #{edition} failed, exit status: #{post_install_status}"
+ raise D3::PostInstallError, "Post_install script for #{edition} failed, exit status: #{post_install_status}"
end
D3.log "Done installing #{edition}#{@using_force}", :warn
else # bad install
raise D3::InstallError, "There was a problem installing #{edition}, 'jamf install' failed"