Commit abddccf1 authored by Fabio Pelosin's avatar Fabio Pelosin

Merge branch 'master' of github.com:CocoaPods/CocoaPods

* 'master' of github.com:CocoaPods/CocoaPods:
  Don't print an error report when someone sends an interrupt signal.
  Add correct encoding comment to error_report.rb.
parents 0fa82acd 9864eedb
......@@ -2,7 +2,7 @@ PODS:
- AFNetworking (0.7.0):
- JSONKit
- FormatterKit (0.7.0)
- JSONKit (1.4)
- JSONKit (1.5pre)
DEPENDENCIES:
- AFNetworking (~> 0.7.0)
......
......@@ -2,7 +2,7 @@ PODS:
- AFNetworking (0.7.0):
- JSONKit
- FormatterKit (0.7.0)
- JSONKit (1.4)
- JSONKit (1.5pre)
DEPENDENCIES:
- AFNetworking (~> 0.7.0)
......
......@@ -54,18 +54,21 @@ module Pod
end
def self.run(*argv)
begin
Setup.new(ARGV.new()).run_if_needed
parse(*argv).run
rescue Exception => e
if e.is_a?(Informative)
puts e.message
puts *e.backtrace if Config.instance.verbose?
else
puts ErrorReport.report(e)
end
exit 1
Setup.new(ARGV.new()).run_if_needed
parse(*argv).run
rescue Interrupt
puts "[!] Cancelled".red
Config.instance.verbose? ? raise : exit(1)
rescue Exception => e
if e.is_a?(Informative)
puts e.message
puts *e.backtrace if Config.instance.verbose?
else
puts ErrorReport.report(e)
end
exit 1
end
def self.parse(*argv)
......
# encoding: UTF-8
require 'rbconfig'
require 'cgi'
require 'rubygems'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment