Skip to content

Commit

Permalink
Merge pull request #196 from gurneyalex/11.0-fix_travis2docker_unassi…
Browse files Browse the repository at this point in the history
…gned_variable

runbot_travis2docker: fix crash
  • Loading branch information
moylop260 committed Jan 8, 2020
2 parents b75f052 + bcba514 commit 8845595
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -12,6 +12,7 @@ cache:
- $HOME/.cache/pip

addons:
postgresql: "9.6"
apt:
packages:
- expect-dev # provides unbuffer utility
Expand Down
4 changes: 2 additions & 2 deletions runbot_travis2docker/models/runbot_build.py
Expand Up @@ -185,15 +185,15 @@ def _get_ssh_keys(self):
keys = ""
for own_key in ['author', 'committer']:
try:
login = response.get(own_key).get('login')
login = response.get(own_key, {}).get('login', '')
if login == '':
continue
ssh_rsa = self.repo_id._github('/users/%s/keys' % login)
keys += '\n' + '\n'.join(rsa['key'] for rsa in ssh_rsa)
except (AttributeError, requests.RequestException) as err:
_logger.warning(
"Error fetching %s (%s): %s", own_key, login, err)
_logger.warning("Response received: %s", response)
_logger.debug("Response received: %s", response)
return keys

def _schedule(self):
Expand Down

0 comments on commit 8845595

Please sign in to comment.