vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix typos

Browse source
This commit is contained in:
Joseph Schorr 2015-02-09 14:53:18 -05:00
parent 384d0eba6f
commit 9b0e43514b
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
buildman/component/buildcomponent.py
View file

@ -217,6 +217,7 @@ class BuildComponent(BaseComponent):
elif phase == BUILD_PHASE.BUILDING: elif phase == BUILD_PHASE.BUILDING:
self._build_status.append_log(current_status_string) self._build_status.append_log(current_status_string)
@trollius.coroutine
def _determine_cache_tag(self, command_comments, base_image_name, base_image_tag, base_image_id): def _determine_cache_tag(self, command_comments, base_image_name, base_image_tag, base_image_id):
with self._build_status as status_dict: with self._build_status as status_dict:
status_dict['total_commands'] = len(command_comments) + 1 status_dict['total_commands'] = len(command_comments) + 1
@ -224,7 +225,8 @@ class BuildComponent(BaseComponent):
logger.debug('Checking cache on realm %s. Base image: %s:%s (%s)', self.builder_realm, logger.debug('Checking cache on realm %s. Base image: %s:%s (%s)', self.builder_realm,
base_image_name, base_image_tag, base_image_id) base_image_name, base_image_tag, base_image_id)
return self._current_job.determine_cached_tag(base_image_id, command_comments) or '' tag_found = self._current_job.determine_cached_tag(base_image_id, command_comments)
raise trollius.Return(tag_found or '')
def _build_failure(self, error_message, exception=None): def _build_failure(self, error_message, exception=None):
""" Handles and logs a failed build. """ """ Handles and logs a failed build. """

2
buildman/jobutil/buildjob.py
View file

@ -117,7 +117,7 @@ class BuildJob(object):
""" Determines the cached tag by looking for one of the tags being built, and seeing if it """ Determines the cached tag by looking for one of the tags being built, and seeing if it
exists in the repository. This is a fallback for when no comment information is available. exists in the repository. This is a fallback for when no comment information is available.
""" """
tags = self._build_config.get('docker_tags', ['latest']) tags = self.build_config.get('docker_tags', ['latest'])
repository = self.repo_build.repository repository = self.repo_build.repository
existing_tags = model.list_repository_tags(repository.namespace_user.username, repository.name) existing_tags = model.list_repository_tags(repository.namespace_user.username, repository.name)
cached_tags = set(tags) & set([tag.name for tag in existing_tags]) cached_tags = set(tags) & set([tag.name for tag in existing_tags])