Fix merge breakage
This commit is contained in:
parent
1c52427cd2
commit
81e96d6c1d
1 changed files with 7 additions and 1 deletions
|
@ -362,8 +362,14 @@ class GithubBuildTrigger(BuildTriggerHandler):
|
||||||
def load_dockerfile_contents(self):
|
def load_dockerfile_contents(self):
|
||||||
config = self.config
|
config = self.config
|
||||||
gh_client = self._get_client()
|
gh_client = self._get_client()
|
||||||
|
|
||||||
source = config['build_source']
|
source = config['build_source']
|
||||||
|
|
||||||
|
try:
|
||||||
|
repo = gh_client.get_repo(source)
|
||||||
|
except GithubException as ghe:
|
||||||
|
message = ghe.data.get('message', 'Unable to list contents of repository: %s' % source)
|
||||||
|
raise RepositoryReadException(message)
|
||||||
|
|
||||||
path = self.get_dockerfile_path()
|
path = self.get_dockerfile_path()
|
||||||
try:
|
try:
|
||||||
file_info = repo.get_file_contents(path)
|
file_info = repo.get_file_contents(path)
|
||||||
|
|
Reference in a new issue