bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-17 04:30:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix failure to extract depot_tools archive due to lack of top-level directory (issue #1877)

Browse Source
This commit is contained in:
Marshall Greenblatt 2016-04-28 13:30:08 -04:00
parent e7ddc933c9
commit 79c8f30d46
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/automate/automate-git.py
View File

@ -132,7 +132,7 @@ def get_git_url(path):
return result['out'].strip() return result['out'].strip()
return 'Unknown' return 'Unknown'
def download_and_extract(src, target, contents_prefix): def download_and_extract(src, target):
""" Extracts the contents of src, which may be a URL or local file, to the """ Extracts the contents of src, which may be a URL or local file, to the
target directory. """ target directory. """
temporary = False temporary = False
@ -155,19 +155,11 @@ def download_and_extract(src, target, contents_prefix):
if not zipfile.is_zipfile(archive_path): if not zipfile.is_zipfile(archive_path):
raise Exception('Not a valid zip archive: ' + src) raise Exception('Not a valid zip archive: ' + src)
def remove_prefix(zip, prefix):
offset = len(prefix)
for zipinfo in zip.infolist():
name = zipinfo.filename
if len(name) > offset and name[:offset] == prefix:
zipinfo.filename = name[offset:]
yield zipinfo
# Attempt to extract the archive file. # Attempt to extract the archive file.
try: try:
os.makedirs(target) os.makedirs(target)
zf = zipfile.ZipFile(archive_path, 'r') zf = zipfile.ZipFile(archive_path, 'r')
zf.extractall(target, remove_prefix(zf, contents_prefix)) zf.extractall(target)
except: except:
shutil.rmtree(target, onerror=onerror) shutil.rmtree(target, onerror=onerror)
raise raise
@ -582,8 +574,7 @@ if not os.path.exists(depot_tools_dir):
msg('Extracting %s to %s.' % \ msg('Extracting %s to %s.' % \
(options.depottoolsarchive, depot_tools_dir)) (options.depottoolsarchive, depot_tools_dir))
if not options.dryrun: if not options.dryrun:
download_and_extract(options.depottoolsarchive, depot_tools_dir, \ download_and_extract(options.depottoolsarchive, depot_tools_dir)
'depot_tools/')
else: else:
# On Linux and OS X check out depot_tools using Git. # On Linux and OS X check out depot_tools using Git.
run('git clone '+depot_tools_url+' '+depot_tools_dir, download_dir) run('git clone '+depot_tools_url+' '+depot_tools_dir, download_dir)