mirror of
https://github.com/platformio/platformio-core.git
synced 2025-07-30 10:07:14 +02:00
Fix issue with an update operation for package manager
This commit is contained in:
@ -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(
|
||||||
|
@ -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" %
|
||||||
|
@ -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'])
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user