platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 10:07:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/v3.5.4' into develop

Browse Source 
* hotfix/v3.5.4:
  Fix issue when "platformio lib uninstall" removes initial source code // Resolve #1023
This commit is contained in:
Ivan Kravets
2018-06-21 21:34:07 +03:00
parent 08759700b6 2725d8da8b
commit b7ad64226e
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY.rst
View File

@ -27,6 +27,10 @@ PlatformIO 3.0
* Fixed issue with invalid LD script if path contains space * Fixed issue with invalid LD script if path contains space
* Fixed preprocessor for Arduino sketch when function returns certain type * Fixed preprocessor for Arduino sketch when function returns certain type
(`issue #1683 <https://github.com/platformio/platformio-core/issues/1683>`_) (`issue #1683 <https://github.com/platformio/platformio-core/issues/1683>`_)
* Fixed issue when `
platformio lib uninstall <http://docs.platformio.org/page/userguide/lib/cmd_uninstall.html>`__
removes initial source code
(`issue #1023 <https://github.com/platformio/platformio-core/issues/1023>`_)
3.5.3 (2018-06-01) 3.5.3 (2018-06-01)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~

12
platformio/managers/package.py
View File

@ -18,7 +18,7 @@ import json
import os import os
import re import re
import shutil import shutil
from os.path import basename, getsize, isdir, isfile, islink, join from os.path import abspath, basename, getsize, isdir, isfile, islink, join
from tempfile import mkdtemp from tempfile import mkdtemp
import click import click
@ -367,6 +367,12 @@ class PkgInstallerMixin(object):
return manifest.get("__pkg_dir") if manifest and isdir( return manifest.get("__pkg_dir") if manifest and isdir(
manifest.get("__pkg_dir")) else None manifest.get("__pkg_dir")) else None
def get_package_by_dir(self, pkg_dir):
for manifest in self.get_installed():
if manifest['__pkg_dir'] == util.path_to_unicode(abspath(pkg_dir)):
return manifest
return None
def find_pkg_root(self, src_dir): def find_pkg_root(self, src_dir):
if self.manifest_exists(src_dir): if self.manifest_exists(src_dir):
return src_dir return src_dir
@ -715,7 +721,7 @@ class BasePkgManager(PkgRepoMixin, PkgInstallerMixin):
return pkg_dir return pkg_dir
def uninstall(self, package, requirements=None, after_update=False): def uninstall(self, package, requirements=None, after_update=False):
if isdir(package): if isdir(package) and self.get_package_by_dir(package):
pkg_dir = package pkg_dir = package
else: else:
name, requirements, url = self.parse_pkg_uri(package, requirements) name, requirements, url = self.parse_pkg_uri(package, requirements)
@ -755,7 +761,7 @@ class BasePkgManager(PkgRepoMixin, PkgInstallerMixin):
return True return True
def update(self, package, requirements=None, only_check=False): def update(self, package, requirements=None, only_check=False):
if isdir(package): if isdir(package) and self.get_package_by_dir(package):
pkg_dir = package pkg_dir = package
else: else:
pkg_dir = self.get_package_dir(*self.parse_pkg_uri(package)) pkg_dir = self.get_package_dir(*self.parse_pkg_uri(package))