Merge remote-tracking branch 'origin/3.4'

This commit is contained in:
Lipu Fei 2018-06-05 09:55:57 +02:00
commit 4598b7a831
4 changed files with 335 additions and 4 deletions

View file

@ -134,7 +134,7 @@ class CuraPackageManager(QObject):
return None
def getAllInstalledPackagesInfo(self) -> dict:
def getAllInstalledPackageIDs(self) -> set:
# Add bundled, installed, and to-install packages to the set of installed package IDs
all_installed_ids = set()
@ -147,6 +147,12 @@ class CuraPackageManager(QObject):
if self._to_install_package_dict.keys():
all_installed_ids = all_installed_ids.union(set(self._to_install_package_dict.keys()))
return all_installed_ids
def getAllInstalledPackagesInfo(self) -> dict:
all_installed_ids = self.getAllInstalledPackageIDs()
# map of <package_type> -> <package_id> -> <package_info>
installed_packages_dict = {}
for package_id in all_installed_ids: