- Rename get_repo_image to get_repo_image_extended and get_repo_image_directly to get_repo_image

- Remove the configure call from CloseForLongOperation
- Other small fixes
This commit is contained in:
Joseph Schorr 2014-11-10 13:44:36 -05:00
parent 17f605a9ef
commit 091f821a6a
6 changed files with 40 additions and 39 deletions

View file

@ -27,7 +27,7 @@ bad_count = 0
good_count = 0
def resolve_or_create(repo, docker_image_id, new_ancestry):
existing = model.get_repo_image(repo.namespace_user.username, repo.name, docker_image_id)
existing = model.get_repo_image_extended(repo.namespace_user.username, repo.name, docker_image_id)
if existing:
logger.debug('Found existing image: %s, %s', existing.id, docker_image_id)
return existing
@ -63,7 +63,7 @@ def all_ancestors_exist(ancestors):
cant_fix = []
for img in query:
try:
with_locations = model.get_repo_image(img.repository.namespace_user.username,
with_locations = model.get_repo_image_extended(img.repository.namespace_user.username,
img.repository.name, img.docker_image_id)
ancestry_storage = store.image_ancestry_path(img.storage.uuid)
if store.exists(with_locations.storage.locations, ancestry_storage):