From 7340d8dadb721146455d1ddd4e815d7997f1e38a Mon Sep 17 00:00:00 2001 From: Ellwood Zwovic Date: Wed, 2 Aug 2017 18:50:11 -0700 Subject: [PATCH] Fix bug where sometimes enabled packages could be displayed as disabled --- package_manager/__init__.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package_manager/__init__.py b/package_manager/__init__.py index d953d3a..ae3b864 100644 --- a/package_manager/__init__.py +++ b/package_manager/__init__.py @@ -1042,8 +1042,7 @@ def build_composite_packagelist(installed: list, available: list) -> OrderedDict for pkg in installed: pkg.installed = True - if pkg.name == 'Node Wrangler': - log.debug("node wrangler %s", pkg.module_name) + pkg.enabled = is_enabled(pkg) pkg.user = is_user_package(pkg) if pkg.name in masterlist: for masterpkg in masterlist[pkg.name]: @@ -1052,6 +1051,7 @@ def build_composite_packagelist(installed: list, available: list) -> OrderedDict masterpkg.installed_location = pkg.installed_location masterpkg.user = pkg.user masterpkg.module_name = pkg.module_name + masterpkg.enabled = pkg.enabled break else: if masterpkg.version > pkg.version: @@ -1060,8 +1060,6 @@ def build_composite_packagelist(installed: list, available: list) -> OrderedDict else: masterlist[pkg.name] = ConsolidatedPackage(pkg) - masterlist[pkg.name].enabled = is_enabled(pkg) - return OrderedDict(sorted(masterlist.items())) def register():