From d8b9780fd4396406ab19d654b8dc769770148998 Mon Sep 17 00:00:00 2001 From: Joshua Hesketh Date: Fri, 25 Jul 2014 12:58:24 +1000 Subject: [PATCH] Fix no index options for zuul_swift_upload The generation of indexes can be turned off with flags provided to zuul_swift_upload.py. The logic of these were incorrect, fix it. Change-Id: I5ab750aa6bd0b8bad8bc2825e35052294005bb84 --- .../files/slave_scripts/zuul_swift_upload.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/files/slave_scripts/zuul_swift_upload.py b/modules/openstack_project/files/slave_scripts/zuul_swift_upload.py index 730b7911c0..b802c8894f 100755 --- a/modules/openstack_project/files/slave_scripts/zuul_swift_upload.py +++ b/modules/openstack_project/files/slave_scripts/zuul_swift_upload.py @@ -196,11 +196,11 @@ if __name__ == '__main__': file_list += build_file_list( file_path, logserver_prefix, swift_destination_prefix, - (not (args.no_indexes and args.no_dir_indexes)) + (not (args.no_indexes or args.no_dir_indexes)) ) index_file = '' - if not (args.no_indexes and args.no_root_index): + if not (args.no_indexes or args.no_root_index): index_file = make_index_file(root_list, logserver_prefix, swift_destination_prefix) file_list.append({