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

Fix an error "Could not extract item..." when extracting TAR archive with symbolic items on Windows platform // Resolve #2015

Browse Source
This commit is contained in:
Ivan Kravets
2019-01-10 19:14:03 +02:00
parent 68e3f9dc00
commit d5d95092c4
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY.rst
View File

@ -16,6 +16,8 @@ PlatformIO 3.0
* Fixed an issue with incorrect detecting of compatibility (LDF) between generic library and Arduino or ARM mbed frameworks * Fixed an issue with incorrect detecting of compatibility (LDF) between generic library and Arduino or ARM mbed frameworks
* Fixed "Runtime Error: Dictionary size changed during iteration" * Fixed "Runtime Error: Dictionary size changed during iteration"
(`issue #2003 <https://github.com/platformio/platformio-core/issues/2003>`_) (`issue #2003 <https://github.com/platformio/platformio-core/issues/2003>`_)
* Fixed an error "Could not extract item..." when extracting TAR archive with symbolic items on Windows platform
(`issue #2015 <https://github.com/platformio/platformio-core/issues/2015>`_)
3.6.3 (2018-12-12) 3.6.3 (2018-12-12)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~

17
platformio/unpacker.py
View File

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
from os import chmod from os import chmod
from os.path import exists, islink, join from os.path import exists, join
from tarfile import open as tarfile_open from tarfile import open as tarfile_open
from time import mktime from time import mktime
from zipfile import ZipFile from zipfile import ZipFile
@ -56,6 +56,10 @@ class TARArchive(ArchiveBase):
def get_item_filename(self, item): def get_item_filename(self, item):
return item.name return item.name
@staticmethod
def islink(item):
return item.islnk() or item.issym()
class ZIPArchive(ArchiveBase): class ZIPArchive(ArchiveBase):
@ -80,6 +84,9 @@ class ZIPArchive(ArchiveBase):
def get_item_filename(self, item): def get_item_filename(self, item):
return item.filename return item.filename
def islink(self, item):
raise NotImplementedError()
def after_extract(self, item, dest_dir): def after_extract(self, item, dest_dir):
self.preserve_permissions(item, dest_dir) self.preserve_permissions(item, dest_dir)
self.preserve_mtime(item, dest_dir) self.preserve_mtime(item, dest_dir)
@ -120,7 +127,9 @@ class FileUnpacker(object):
for item in self._unpacker.get_items(): for item in self._unpacker.get_items():
filename = self._unpacker.get_item_filename(item) filename = self._unpacker.get_item_filename(item)
item_path = join(dest_dir, filename) item_path = join(dest_dir, filename)
if not islink(item_path) and not exists(item_path): try:
raise exception.ExtractArchiveItemError(filename, dest_dir) if not self._unpacker.islink(item) and not exists(item_path):
raise exception.ExtractArchiveItemError(filename, dest_dir)
except NotImplementedError:
pass
return True return True