diff --git a/platformio/maintenance.py b/platformio/maintenance.py index b0485fc3..9e56a396 100644 --- a/platformio/maintenance.py +++ b/platformio/maintenance.py @@ -94,7 +94,7 @@ class Upgrader(object): self._upgraders = [ (semantic_version.Version("3.0.0-a.1"), self._upgrade_to_3_0_0), - (semantic_version.Version("3.0.0-b.11"), self._upgrade_to_3_0_0) + (semantic_version.Version("3.0.0-b.11"), self._upgrade_to_3_0_0b11) ] def run(self, ctx): @@ -160,7 +160,7 @@ def after_upgrade(ctx): if u.run(ctx): app.set_state_item("last_version", __version__) - # update PlatformIO Plus tool if installed + # update PlatformIO Plus tool if it's installed pioplus_update() click.secho( diff --git a/platformio/managers/package.py b/platformio/managers/package.py index 539c5ab8..8e1b9725 100644 --- a/platformio/managers/package.py +++ b/platformio/managers/package.py @@ -678,9 +678,7 @@ class BasePkgManager(PkgRepoMixin, PkgInstallerMixin): if isdir(package): pkg_dir = package else: - name, requirements, url = self.parse_pkg_input(package, - requirements) - pkg_dir = self.get_package_dir(name, requirements, url) + pkg_dir = self.get_package_dir(*self.parse_pkg_input(package)) if not pkg_dir: raise exception.UnknownPackage("%s @ %s" % diff --git a/platformio/pioplus.py b/platformio/pioplus.py index 91a7447b..bdd76bb5 100644 --- a/platformio/pioplus.py +++ b/platformio/pioplus.py @@ -49,14 +49,14 @@ class PioPlusPackageManager(PackageManager): def pioplus_install(): pm = PioPlusPackageManager() for item in PACKAGE_DEPS.values(): - pm.install(item['name'], item['requirements'], silent=True) + if not pm.get_package(item['name'], item['requirements']): + pm.install(item['name'], item['requirements']) def pioplus_update(): pm = PioPlusPackageManager() for item in PACKAGE_DEPS.values(): - package_dir = pm.get_package_dir(item['name']) - if package_dir: + if pm.get_package(item['name']): pm.update(item['name'], item['requirements'])