feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Fix issue with an update operation for package manager

Browse Source
This commit is contained in:
Ivan Kravets
2017-03-10 00:29:22 +02:00
parent f8b2902c91
commit 2cd3592a49
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platformio/maintenance.py
View File

@ -94,7 +94,7 @@ class Upgrader(object):
self._upgraders = [ self._upgraders = [
(semantic_version.Version("3.0.0-a.1"), self._upgrade_to_3_0_0), (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): def run(self, ctx):
@ -160,7 +160,7 @@ def after_upgrade(ctx):
if u.run(ctx): if u.run(ctx):
app.set_state_item("last_version", __version__) app.set_state_item("last_version", __version__)
# update PlatformIO Plus tool if installed # update PlatformIO Plus tool if it's installed
pioplus_update() pioplus_update()
click.secho( click.secho(

4
platformio/managers/package.py
View File

@ -678,9 +678,7 @@ class BasePkgManager(PkgRepoMixin, PkgInstallerMixin):
if isdir(package): if isdir(package):
pkg_dir = package pkg_dir = package
else: else:
name, requirements, url = self.parse_pkg_input(package, pkg_dir = self.get_package_dir(*self.parse_pkg_input(package))
requirements)
pkg_dir = self.get_package_dir(name, requirements, url)
if not pkg_dir: if not pkg_dir:
raise exception.UnknownPackage("%s @ %s" % raise exception.UnknownPackage("%s @ %s" %

6
platformio/pioplus.py
View File

@ -49,14 +49,14 @@ class PioPlusPackageManager(PackageManager):
def pioplus_install(): def pioplus_install():
pm = PioPlusPackageManager() pm = PioPlusPackageManager()
for item in PACKAGE_DEPS.values(): 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(): def pioplus_update():
pm = PioPlusPackageManager() pm = PioPlusPackageManager()
for item in PACKAGE_DEPS.values(): for item in PACKAGE_DEPS.values():
package_dir = pm.get_package_dir(item['name']) if pm.get_package(item['name']):
if package_dir:
pm.update(item['name'], item['requirements']) pm.update(item['name'], item['requirements'])