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
This commit is contained in:
Joshua Hesketh 2014-07-25 12:58:24 +10:00
parent e1aabf89eb
commit d8b9780fd4

View File

@ -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({