Fix bug where sometimes enabled packages could be displayed as disabled

This commit is contained in:
Ellwood Zwovic
2017-08-02 18:50:11 -07:00
parent 2825d0fc06
commit 7340d8dadb

View File

@@ -1042,8 +1042,7 @@ def build_composite_packagelist(installed: list, available: list) -> OrderedDict
for pkg in installed: for pkg in installed:
pkg.installed = True pkg.installed = True
if pkg.name == 'Node Wrangler': pkg.enabled = is_enabled(pkg)
log.debug("node wrangler %s", pkg.module_name)
pkg.user = is_user_package(pkg) pkg.user = is_user_package(pkg)
if pkg.name in masterlist: if pkg.name in masterlist:
for masterpkg in masterlist[pkg.name]: 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.installed_location = pkg.installed_location
masterpkg.user = pkg.user masterpkg.user = pkg.user
masterpkg.module_name = pkg.module_name masterpkg.module_name = pkg.module_name
masterpkg.enabled = pkg.enabled
break break
else: else:
if masterpkg.version > pkg.version: if masterpkg.version > pkg.version:
@@ -1060,8 +1060,6 @@ def build_composite_packagelist(installed: list, available: list) -> OrderedDict
else: else:
masterlist[pkg.name] = ConsolidatedPackage(pkg) masterlist[pkg.name] = ConsolidatedPackage(pkg)
masterlist[pkg.name].enabled = is_enabled(pkg)
return OrderedDict(sorted(masterlist.items())) return OrderedDict(sorted(masterlist.items()))
def register(): def register():