Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
btalb committed Feb 17, 2022
2 parents 4913d48 + 75cc4d5 commit 80f6366
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions benchbot_addons/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,7 @@ def load_functions(data, key='functions'):
sys.path.insert(0, os.path.dirname(data[KEY_FILE_PATH]))
ret = {
k: getattr(importlib.import_module(re.sub('\.[^\.]*$', "", v)),
re.sub('^.*\.', "", v))
for k, v in data[key].items()
re.sub('^.*\.', "", v)) for k, v in data[key].items()
}
del sys.path[0]
return ret
Expand Down Expand Up @@ -235,10 +234,10 @@ def install_addon(name):
print("\tFound remote content to install to '%s': %s" %
(target, remote))
state = get_state()
if (name not in state or 'remote' not in state[name]
or state[name]['remote'] != remote
or 'remote_target' not in state[name]
or state[name]['remote_target'] != target):
if (name not in state or 'remote' not in state[name] or
state[name]['remote'] != remote or
'remote_target' not in state[name] or
state[name]['remote_target'] != target):
print("\tRemote content is new. Fetching ...")
if (run('wget "%s" -O ".tmp.zip"' % remote, **{
**cmd_args, 'stdout': None,
Expand Down

0 comments on commit 80f6366

Please sign in to comment.