Do not warn about unknown packages if they are built-in libraries

This commit is contained in:
Ivan Kravets
2022-03-19 18:13:29 +02:00
parent 81f343dbe8
commit 346580d955
2 changed files with 11 additions and 13 deletions

View File

@ -125,14 +125,17 @@ class PackageManagerInstallMixin(object):
if print_header: if print_header:
self.log.info("Resolving dependencies...") self.log.info("Resolving dependencies...")
for dependency in dependencies: for dependency in dependencies:
if not self._install_dependency(dependency): try:
self.log.warning( self._install_dependency(dependency)
click.style( except UnknownPackageError:
"Warning! Could not install dependency %s for package '%s'" if dependency.get("owner"):
% (dependency, pkg.metadata.name), self.log.warning(
fg="yellow", click.style(
"Warning! Could not install dependency %s for package '%s'"
% (dependency, pkg.metadata.name),
fg="yellow",
)
) )
)
def _install_dependency(self, dependency): def _install_dependency(self, dependency):
spec = PackageSpec( spec = PackageSpec(
@ -145,11 +148,7 @@ class PackageManagerInstallMixin(object):
for key, value in dependency.items() for key, value in dependency.items()
if key in ("authors", "platforms", "frameworks") if key in ("authors", "platforms", "frameworks")
} }
try: return self._install(spec, search_filters=search_filters or None)
return self._install(spec, search_filters=search_filters or None)
except UnknownPackageError:
pass
return None
def install_from_url(self, url, spec, checksum=None): def install_from_url(self, url, spec, checksum=None):
spec = self.ensure_spec(spec) spec = self.ensure_spec(spec)

View File

@ -56,7 +56,6 @@ def test_global_packages(
], ],
) )
validate_cliresult(result) validate_cliresult(result)
assert "Warning! Could not install dependency {'name': 'Hash'" in result.output
assert pkgs_to_names(LibraryPackageManager().get_installed()) == [ assert pkgs_to_names(LibraryPackageManager().get_installed()) == [
"ArduinoJson", "ArduinoJson",
"AsyncMqttClient", "AsyncMqttClient",