From 71f9c2641846eeaffbfbf9b664250d474eb12e8d Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 5 Jun 2015 08:47:00 -0700
Subject: [PATCH] Only migrate config when not including deprecated APIs

---
 spec/package-manager-spec.coffee | 10 ++++++++++
 src/package-manager.coffee       |  1 +
 2 files changed, 11 insertions(+)

diff --git a/spec/package-manager-spec.coffee b/spec/package-manager-spec.coffee
index af9378caa..26b675975 100644
--- a/spec/package-manager-spec.coffee
+++ b/spec/package-manager-spec.coffee
@@ -879,6 +879,16 @@ describe "PackageManager", ->
         expect(fs.isSymbolicLinkSync(autocompletePlusPath)).toBe true
 
   describe "when the deprecated sublime-tabs package is installed", ->
+    grim = require 'grim'
+    includeDeprecatedAPIs = null
+
+    beforeEach ->
+      {includeDeprecatedAPIs} = grim
+      grim.includeDeprecatedAPIs = false
+
+    afterEach ->
+      grim.includeDeprecatedAPIs = includeDeprecatedAPIs
+
     it "enables the tree-view and tabs package", ->
       atom.config.pushAtKeyPath('core.disabledPackages', 'tree-view')
       atom.config.pushAtKeyPath('core.disabledPackages', 'tabs')
diff --git a/src/package-manager.coffee b/src/package-manager.coffee
index 478f16dd7..aeb67ea3b 100644
--- a/src/package-manager.coffee
+++ b/src/package-manager.coffee
@@ -451,6 +451,7 @@ class PackageManager
 
   # TODO: remove this after a few versions
   migrateSublimeTabsSettings: (packagePaths) ->
+    return if Grim.includeDeprecatedAPIs
     for packagePath in packagePaths when path.basename(packagePath) is 'sublime-tabs'
       atom.config.removeAtKeyPath('core.disabledPackages', 'tree-view')
       atom.config.removeAtKeyPath('core.disabledPackages', 'tabs')