Skip to content

Commit 2098bea

Browse files
committed
Merge pull request wbond#833 from FichteFoll/fix_dep_remove
Make removing dependencies work
2 parents ca05ef5 + 01d6d45 commit 2098bea

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Diff for: package_control/loader.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,10 @@ def remove(name):
178178
return
179179

180180
disabler = PackageDisabler()
181-
disabler.disable_package(loader_package_name)
181+
disabler.disable_packages(loader_package_name, 'loader')
182182

183183
def do_swap():
184184
os.remove(loader_package_path)
185185
os.rename(new_loader_package_path, loader_package_path)
186-
sublime.set_timeout(lambda: disabler.reenable_package(loader_package_name), 10)
186+
sublime.set_timeout(lambda: disabler.reenable_package(loader_package_name, 'loader'), 10)
187187
sublime.set_timeout(do_swap, 700)

Diff for: package_control/package_disabler.py

+2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ def disable_packages(self, packages, type='upgrade'):
5050
- "remove"
5151
- "install"
5252
- "disable"
53+
- "loader"
5354
"""
5455

5556
if not isinstance(packages, list):
@@ -126,6 +127,7 @@ def reenable_package(self, package, type='upgrade'):
126127
- "remove"
127128
- "install"
128129
- "enable"
130+
- "loader"
129131
"""
130132

131133
settings = sublime.load_settings(preferences_filename())

0 commit comments

Comments
 (0)