Merge branch 'opentable-ocho'

CHANGELOG.md

@@ -6,6 +6,16 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 ##### Bug Fixes
 
+* Works around an Xcode issue where linting would fail even though `xcodebuild`
+  actually succeeds. Xcode.app also doesn't fail when this issue occurs, so it's
+  safe for us to do the same.
+  [Kra Larivain](https://github.com/olarivain)
+  [Boris Bügling](https://github.com/neonichu)
+  [Eloy Durán](https://github.com/alloy)
+  [Samuel E. Giddins](https://github.com/segiddins)
+  [#2394](https://github.com/CocoaPods/CocoaPods/issues/2394)
+  [#2395](https://github.com/CocoaPods/CocoaPods/pull/2395)
+
 * Fixes the detection of JSON podspecs included via `:path`.
   [laiso](https://github.com/laiso)
   [#2489](https://github.com/CocoaPods/CocoaPods/pull/2489)

lib/cocoapods/validator.rb

@@ -325,7 +325,14 @@ module Pod
           UI.puts output
           parsed_output  = parse_xcodebuild_output(output)
           parsed_output.each do |message|
-            if message.include?('error: ')
+            # Checking the error for `InputFile` is to work around an Xcode
+            # issue where linting would fail even though `xcodebuild` actually
+            # succeeds. Xcode.app also doesn't fail when this issue occurs, so
+            # it's safe for us to do the same.
+            #
+            # For more details see https://github.com/CocoaPods/CocoaPods/issues/2394#issuecomment-56658587
+            #
+            if message.include?('error: ') && !message.include?("'InputFile' should have")
               error "[xcodebuild] #{message}"
             else
               note "[xcodebuild] #{message}"