From b2a183ef614bfcf4d87f5c10b7ab0b50de2d27d1 Mon Sep 17 00:00:00 2001 From: Vladimir Diaz Date: Mon, 31 Jul 2017 15:48:50 -0400 Subject: [PATCH] Specify compression_algorithms when calling _generate_and_write_metadata() --- tuf/repository_tool.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/tuf/repository_tool.py b/tuf/repository_tool.py index a77f8b45..5ad6ad15 100755 --- a/tuf/repository_tool.py +++ b/tuf/repository_tool.py @@ -246,7 +246,9 @@ def writeall(self, consistent_snapshot=False): dirty_rolename + METADATA_EXTENSION) repo_lib._generate_and_write_metadata(dirty_rolename, dirty_filename, self._targets_directory, self._metadata_directory, - consistent_snapshot, filenames, repository_name=self._repository_name) + consistent_snapshot, filenames, + compression_algorithms=compression_algorithms, + repository_name=self._repository_name) # Metadata should be written in (delegated targets -> root -> targets -> # snapshot -> timestamp) order. Begin by generating the 'root.json' @@ -256,26 +258,31 @@ def writeall(self, consistent_snapshot=False): if 'root' in dirty_rolenames or consistent_snapshot: repo_lib._generate_and_write_metadata('root', filenames['root'], self._targets_directory, self._metadata_directory, - consistent_snapshot, filenames, repository_name=self._repository_name) + consistent_snapshot, filenames, + compression_algorithms=compression_algorithms, + repository_name=self._repository_name) # Generate the 'targets.json' metadata file. if 'targets' in dirty_rolenames: repo_lib._generate_and_write_metadata('targets', filenames['targets'], self._targets_directory, self._metadata_directory, - consistent_snapshot, repository_name=self._repository_name) + consistent_snapshot, compression_algorithms=compression_algorithms, + repository_name=self._repository_name) # Generate the 'snapshot.json' metadata file. if 'snapshot' in dirty_rolenames: snapshot_signable, junk = repo_lib._generate_and_write_metadata('snapshot', filenames['snapshot'], self._targets_directory, self._metadata_directory, consistent_snapshot, filenames, + compression_algorithms=compression_algorithms, repository_name=self._repository_name) # Generate the 'timestamp.json' metadata file. if 'timestamp' in dirty_rolenames: repo_lib._generate_and_write_metadata('timestamp', filenames['timestamp'], self._targets_directory, self._metadata_directory, consistent_snapshot, - filenames, repository_name=self._repository_name) + filenames, compression_algorithms=compression_algorithms, + repository_name=self._repository_name) tuf.roledb.unmark_dirty(dirty_rolenames, self._repository_name) @@ -331,7 +338,8 @@ def write(self, rolename, consistent_snapshot=False, increment_version_number=Tr repo_lib._generate_and_write_metadata(rolename, rolename_filename, self._targets_directory, self._metadata_directory, consistent_snapshot, - filenames=filenames, allow_partially_signed=True, + filenames=filenames, + allow_partially_signed=True, increment_version_number=increment_version_number, repository_name=self._repository_name)