From e83b6a6b4566b3265442a33d4e97aa7f0fdad26a Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Fri, 20 Jun 2014 12:18:28 +0100
Subject: Revert "xcode: add new package ID for Mavericks."

This reverts commit b0caede328b5181106451025df74a456276b76cf.

Fixes Homebrew/homebrew#30299.
---
 Library/Homebrew/os/mac/xcode.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'Library/Homebrew/os/mac/xcode.rb')

diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb
index cdc9b54d6..7d8f12796 100644
--- a/Library/Homebrew/os/mac/xcode.rb
+++ b/Library/Homebrew/os/mac/xcode.rb
@@ -146,8 +146,7 @@ module OS
 
       STANDALONE_PKG_ID = "com.apple.pkg.DeveloperToolsCLILeo"
       FROM_XCODE_PKG_ID = "com.apple.pkg.DeveloperToolsCLI"
-      MAVERICKS_PKG_IDS = ["com.apple.pkg.CLTools_Base",
-                           "com.apple.pkg.CLTools_Executables"]
+      MAVERICKS_PKG_ID = "com.apple.pkg.CLTools_Executables"
       MAVERICKS_PKG_PATH = "/Library/Developer/CommandLineTools"
 
       # Returns true even if outdated tools are installed, e.g.
@@ -182,7 +181,7 @@ module OS
       end
 
       def detect_version
-        [*MAVERICKS_PKG_IDS, STANDALONE_PKG_ID, FROM_XCODE_PKG_ID].find do |id|
+        [MAVERICKS_PKG_ID, STANDALONE_PKG_ID, FROM_XCODE_PKG_ID].find do |id|
           version = MacOS.pkgutil_info(id)[/version: (.+)$/, 1]
           return version if version
         end
-- 
cgit v1.2.3