ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm-pack-manager - fix tracebacks 

Fix tracebacks from trying to read dictionary values that don't exist
and from incorrect variable names.
pull/3588/head
Russ Butler 2017-01-13 11:54:27 -06:00
parent 469b54700b
commit 7a8964af6f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/arm_pack_manager/__init__.py
View File

@ -251,8 +251,9 @@ class Cache () :
:return: A file-like object that, when read, is the ELF file that describes the flashing algorithm :return: A file-like object that, when read, is the ELF file that describes the flashing algorithm
:rtype: ZipExtFile :rtype: ZipExtFile
""" """
pack = self.pack_from_cache(self.index[device_name]) device = self.index[device_name]
return pack.open(device['algorithm']['file']) pack = self.pack_from_cache(device)
return pack.open(device['algorithm'].keys()[0])
def get_svd_file(self, device_name) : def get_svd_file(self, device_name) :
"""Retrieve the flash algorithm file for a particular part. """Retrieve the flash algorithm file for a particular part.
@ -264,7 +265,8 @@ class Cache () :
:return: A file-like object that, when read, is the ELF file that describes the flashing algorithm :return: A file-like object that, when read, is the ELF file that describes the flashing algorithm
:rtype: ZipExtFile :rtype: ZipExtFile
""" """
pack = self.pack_from_cache(self.index[device_name]) device = self.index[device_name]
pack = self.pack_from_cache(device)
return pack.open(device['debug']) return pack.open(device['debug'])
def generate_index(self) : def generate_index(self) :
@ -407,7 +409,7 @@ class Cache () :
with open(dest, "r") as fd : with open(dest, "r") as fd :
return BeautifulSoup(fd, "html.parser") return BeautifulSoup(fd, "html.parser")
def pack_from_cache(self, url) : def pack_from_cache(self, device) :
"""Low level inteface for extracting a PACK file from the cache. """Low level inteface for extracting a PACK file from the cache.
Assumes that the file specified is a PACK file and is in the cache. Assumes that the file specified is a PACK file and is in the cache.