Skip to content

Commit

Permalink
Revert "Support tar.gz file (emscripten-core#8355)"
Browse files Browse the repository at this point in the history
This reverts commit e6b1f3e.
  • Loading branch information
VirtualTim authored May 23, 2019
1 parent 527b6f4 commit c431eb4
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions tools/system_libs.py
Original file line number Diff line number Diff line change
Expand Up @@ -872,12 +872,7 @@ def fetch_project(name, url, subdir, is_tarbz2=False):
Ports.clear_project_build(name)
return

if is_tarbz2:
fullpath = fullname + '.tar.bz2'
elif url.endswith('.tar.gz'):
fullpath = fullname + '.tar.gz'
else:
fullpath = fullname + '.zip'
fullpath = fullname + ('.tar.bz2' if is_tarbz2 else '.zip')

if name not in Ports.name_cache: # only mention each port once in log
logger.debug('including port: ' + name)
Expand All @@ -904,8 +899,6 @@ def retrieve():
def check_tag():
if is_tarbz2:
names = tarfile.open(fullpath, 'r:bz2').getnames()
elif url.endswith('.tar.gz'):
names = tarfile.open(fullpath, 'r:gz').getnames()
else:
names = zipfile.ZipFile(fullpath, 'r').namelist()

Expand All @@ -918,8 +911,6 @@ def unpack():
shared.safe_ensure_dirs(fullname)
if is_tarbz2:
z = tarfile.open(fullpath, 'r:bz2')
elif url.endswith('.tar.gz'):
z = tarfile.open(fullpath, 'r:gz')
else:
z = zipfile.ZipFile(fullpath, 'r')
try:
Expand Down

0 comments on commit c431eb4

Please sign in to comment.