[Bf-blender-cvs] [6be55223dcf] soc-2017-package_manager: Improve documentation and remove extraneous function
gandalf3
noreply at git.blender.org
Tue Aug 29 11:45:57 CEST 2017
Commit: 6be55223dcf4584ffe09240a282f27f6d8c6c42b
Author: gandalf3
Date: Mon Aug 28 22:35:54 2017 -0700
Branches: soc-2017-package_manager
https://developer.blender.org/rB6be55223dcf4584ffe09240a282f27f6d8c6c42b
Improve documentation and remove extraneous function
===================================================================
M release/scripts/modules/bpkg/__init__.py
===================================================================
diff --git a/release/scripts/modules/bpkg/__init__.py b/release/scripts/modules/bpkg/__init__.py
index da1a5364963..dc6430800d5 100644
--- a/release/scripts/modules/bpkg/__init__.py
+++ b/release/scripts/modules/bpkg/__init__.py
@@ -10,7 +10,7 @@ from . import exceptions
from pathlib import Path
import logging
-# global package list, use refresh_packages() to refresh
+# Global package dict, keyed by package name. Use refresh_packages() to update it
packages = {}
def get_repo_storage_path() -> Path:
@@ -58,10 +58,11 @@ def get_installed_packages(refresh=False) -> list:
installed_pkgs.append(pkg)
return installed_pkgs
-def _build_packagelist() -> dict: # {{{
- """Return a dict of ConsolidatedPackages from known repositories and
+def refresh_packages(): # {{{
+ """Update bpkg.packages, a dict of ConsolidatedPackages from known repositories and
installed packages, keyed by package name"""
+ global packages
masterlist = {}
display.pkg_errors.clear()
installed_packages = get_installed_packages(refresh=True)# {{{
@@ -81,11 +82,5 @@ def _build_packagelist() -> dict: # {{{
else:
masterlist[pkg.name] = types.ConsolidatedPackage(pkg)
- return masterlist
+ packages = masterlist
# }}}
-
-def refresh_packages():
- """Update bpkg.packages"""
- global packages
- packages = _build_packagelist()
- return packages
More information about the Bf-blender-cvs
mailing list