Skip to content

arm-pack-manager - fix tracebacks #3588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 26, 2017
Merged

arm-pack-manager - fix tracebacks #3588

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a8964a
arm-pack-manager - fix tracebacks
c1728p9 Jan 13, 2017
5ccd015
Correct revision compares
theotherjimmy Jan 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions tools/arm_pack_manager/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ def strip_protocol(url) :
return protocol_matcher.sub("", str(url))

def largest_version(content) :
return sorted([t['version'] for t in content.package.releases('release')], reverse=True)[0]
return sorted([t['version'] for t in content.package.releases('release')],
reverse=True, key=lambda v: map(int, v.split(".")))[0]

def do_queue(Class, function, interable) :
q = Queue()
Expand Down Expand Up @@ -251,8 +252,9 @@ def get_flash_algorthim_binary(self, device_name) :
:return: A file-like object that, when read, is the ELF file that describes the flashing algorithm
:rtype: ZipExtFile
"""
pack = self.pack_from_cache(self.index[device_name])
return pack.open(device['algorithm']['file'])
device = self.index[device_name]
pack = self.pack_from_cache(device)
return pack.open(device['algorithm'].keys()[0])

def get_svd_file(self, device_name) :
"""Retrieve the flash algorithm file for a particular part.
Expand All @@ -264,7 +266,8 @@ def get_svd_file(self, device_name) :
:return: A file-like object that, when read, is the ELF file that describes the flashing algorithm
: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'])

def generate_index(self) :
Expand Down Expand Up @@ -407,7 +410,7 @@ def pdsc_from_cache(self, url) :
with open(dest, "r") as fd :
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.

Assumes that the file specified is a PACK file and is in the cache.
Expand Down