Merge "Fix broken save,list images/dependencies options"

This commit is contained in:
Jenkins 2016-07-01 13:19:22 +00:00 committed by Gerrit Code Review
commit 9b05eb87b8

View File

@ -920,14 +920,19 @@ def run_build():
kolla.set_time() kolla.set_time()
if conf.save_dependency: if conf.save_dependency:
kolla.build_image_list()
kolla.find_parents()
kolla.save_dependency(conf.save_dependency) kolla.save_dependency(conf.save_dependency)
LOG.info('Docker images dependency are saved in %s', LOG.info('Docker images dependency are saved in %s',
conf.save_dependency) conf.save_dependency)
return return
if conf.list_images: if conf.list_images:
kolla.build_image_list()
kolla.list_images() kolla.list_images()
return return
if conf.list_dependencies: if conf.list_dependencies:
kolla.build_image_list()
kolla.find_parents()
kolla.list_dependencies() kolla.list_dependencies()
return return