diff --git a/tests/repository_data/client/test_repository/metadata/current/1.root.json b/tests/repository_data/client/test_repository/metadata/current/1.root.json index 7835711f..87199e95 100644 Binary files a/tests/repository_data/client/test_repository/metadata/current/1.root.json and b/tests/repository_data/client/test_repository/metadata/current/1.root.json differ diff --git a/tests/repository_data/client/test_repository/metadata/current/1.root.json.gz b/tests/repository_data/client/test_repository/metadata/current/1.root.json.gz deleted file mode 100644 index 741b2d29..00000000 Binary files a/tests/repository_data/client/test_repository/metadata/current/1.root.json.gz and /dev/null differ diff --git a/tests/repository_data/client/test_repository/metadata/current/role1.json.gz b/tests/repository_data/client/test_repository/metadata/current/role1.json.gz index 33bdf2ea..ba2a33b2 100644 Binary files a/tests/repository_data/client/test_repository/metadata/current/role1.json.gz and b/tests/repository_data/client/test_repository/metadata/current/role1.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/current/role2.json.gz b/tests/repository_data/client/test_repository/metadata/current/role2.json.gz index 3d23a94c..4ded997d 100644 Binary files a/tests/repository_data/client/test_repository/metadata/current/role2.json.gz and b/tests/repository_data/client/test_repository/metadata/current/role2.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/current/root.json b/tests/repository_data/client/test_repository/metadata/current/root.json index 7835711f..87199e95 100644 Binary files a/tests/repository_data/client/test_repository/metadata/current/root.json and b/tests/repository_data/client/test_repository/metadata/current/root.json differ diff --git a/tests/repository_data/client/test_repository/metadata/current/snapshot.json b/tests/repository_data/client/test_repository/metadata/current/snapshot.json index 3ee5468c..d99849b9 100644 Binary files a/tests/repository_data/client/test_repository/metadata/current/snapshot.json and b/tests/repository_data/client/test_repository/metadata/current/snapshot.json differ diff --git a/tests/repository_data/client/test_repository/metadata/current/snapshot.json.gz b/tests/repository_data/client/test_repository/metadata/current/snapshot.json.gz index a57d0051..fd4dd5d4 100644 Binary files a/tests/repository_data/client/test_repository/metadata/current/snapshot.json.gz and b/tests/repository_data/client/test_repository/metadata/current/snapshot.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/current/targets.json b/tests/repository_data/client/test_repository/metadata/current/targets.json index 0620bfe4..d24509a5 100644 Binary files a/tests/repository_data/client/test_repository/metadata/current/targets.json and b/tests/repository_data/client/test_repository/metadata/current/targets.json differ diff --git a/tests/repository_data/client/test_repository/metadata/current/targets.json.gz b/tests/repository_data/client/test_repository/metadata/current/targets.json.gz index 5a519066..84f938ac 100644 Binary files a/tests/repository_data/client/test_repository/metadata/current/targets.json.gz and b/tests/repository_data/client/test_repository/metadata/current/targets.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/current/timestamp.json b/tests/repository_data/client/test_repository/metadata/current/timestamp.json index 43adf289..d620980e 100644 Binary files a/tests/repository_data/client/test_repository/metadata/current/timestamp.json and b/tests/repository_data/client/test_repository/metadata/current/timestamp.json differ diff --git a/tests/repository_data/client/test_repository/metadata/current/timestamp.json.gz b/tests/repository_data/client/test_repository/metadata/current/timestamp.json.gz index ac8247df..7cadac74 100644 Binary files a/tests/repository_data/client/test_repository/metadata/current/timestamp.json.gz and b/tests/repository_data/client/test_repository/metadata/current/timestamp.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/previous/1.root.json b/tests/repository_data/client/test_repository/metadata/previous/1.root.json index 7835711f..87199e95 100644 Binary files a/tests/repository_data/client/test_repository/metadata/previous/1.root.json and b/tests/repository_data/client/test_repository/metadata/previous/1.root.json differ diff --git a/tests/repository_data/client/test_repository/metadata/previous/1.root.json.gz b/tests/repository_data/client/test_repository/metadata/previous/1.root.json.gz deleted file mode 100644 index 741b2d29..00000000 Binary files a/tests/repository_data/client/test_repository/metadata/previous/1.root.json.gz and /dev/null differ diff --git a/tests/repository_data/client/test_repository/metadata/previous/role1.json.gz b/tests/repository_data/client/test_repository/metadata/previous/role1.json.gz index 33bdf2ea..ba2a33b2 100644 Binary files a/tests/repository_data/client/test_repository/metadata/previous/role1.json.gz and b/tests/repository_data/client/test_repository/metadata/previous/role1.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/previous/role2.json.gz b/tests/repository_data/client/test_repository/metadata/previous/role2.json.gz index 3d23a94c..4ded997d 100644 Binary files a/tests/repository_data/client/test_repository/metadata/previous/role2.json.gz and b/tests/repository_data/client/test_repository/metadata/previous/role2.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/previous/root.json b/tests/repository_data/client/test_repository/metadata/previous/root.json index 7835711f..87199e95 100644 Binary files a/tests/repository_data/client/test_repository/metadata/previous/root.json and b/tests/repository_data/client/test_repository/metadata/previous/root.json differ diff --git a/tests/repository_data/client/test_repository/metadata/previous/snapshot.json b/tests/repository_data/client/test_repository/metadata/previous/snapshot.json index 3ee5468c..d99849b9 100644 Binary files a/tests/repository_data/client/test_repository/metadata/previous/snapshot.json and b/tests/repository_data/client/test_repository/metadata/previous/snapshot.json differ diff --git a/tests/repository_data/client/test_repository/metadata/previous/snapshot.json.gz b/tests/repository_data/client/test_repository/metadata/previous/snapshot.json.gz index a57d0051..fd4dd5d4 100644 Binary files a/tests/repository_data/client/test_repository/metadata/previous/snapshot.json.gz and b/tests/repository_data/client/test_repository/metadata/previous/snapshot.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/previous/targets.json b/tests/repository_data/client/test_repository/metadata/previous/targets.json index 0620bfe4..d24509a5 100644 Binary files a/tests/repository_data/client/test_repository/metadata/previous/targets.json and b/tests/repository_data/client/test_repository/metadata/previous/targets.json differ diff --git a/tests/repository_data/client/test_repository/metadata/previous/targets.json.gz b/tests/repository_data/client/test_repository/metadata/previous/targets.json.gz index 5a519066..84f938ac 100644 Binary files a/tests/repository_data/client/test_repository/metadata/previous/targets.json.gz and b/tests/repository_data/client/test_repository/metadata/previous/targets.json.gz differ diff --git a/tests/repository_data/client/test_repository/metadata/previous/timestamp.json b/tests/repository_data/client/test_repository/metadata/previous/timestamp.json index 43adf289..d620980e 100644 Binary files a/tests/repository_data/client/test_repository/metadata/previous/timestamp.json and b/tests/repository_data/client/test_repository/metadata/previous/timestamp.json differ diff --git a/tests/repository_data/client/test_repository/metadata/previous/timestamp.json.gz b/tests/repository_data/client/test_repository/metadata/previous/timestamp.json.gz index ac8247df..7cadac74 100644 Binary files a/tests/repository_data/client/test_repository/metadata/previous/timestamp.json.gz and b/tests/repository_data/client/test_repository/metadata/previous/timestamp.json.gz differ diff --git a/tests/repository_data/repository/metadata.staged/1.root.json b/tests/repository_data/repository/metadata.staged/1.root.json index 7835711f..87199e95 100644 Binary files a/tests/repository_data/repository/metadata.staged/1.root.json and b/tests/repository_data/repository/metadata.staged/1.root.json differ diff --git a/tests/repository_data/repository/metadata.staged/1.root.json.gz b/tests/repository_data/repository/metadata.staged/1.root.json.gz index 741b2d29..cdf8f228 100644 Binary files a/tests/repository_data/repository/metadata.staged/1.root.json.gz and b/tests/repository_data/repository/metadata.staged/1.root.json.gz differ diff --git a/tests/repository_data/repository/metadata.staged/role1.json.gz b/tests/repository_data/repository/metadata.staged/role1.json.gz index 33bdf2ea..ba2a33b2 100644 Binary files a/tests/repository_data/repository/metadata.staged/role1.json.gz and b/tests/repository_data/repository/metadata.staged/role1.json.gz differ diff --git a/tests/repository_data/repository/metadata.staged/role2.json.gz b/tests/repository_data/repository/metadata.staged/role2.json.gz index 3d23a94c..4ded997d 100644 Binary files a/tests/repository_data/repository/metadata.staged/role2.json.gz and b/tests/repository_data/repository/metadata.staged/role2.json.gz differ diff --git a/tests/repository_data/repository/metadata.staged/root.json b/tests/repository_data/repository/metadata.staged/root.json index 7835711f..87199e95 100644 Binary files a/tests/repository_data/repository/metadata.staged/root.json and b/tests/repository_data/repository/metadata.staged/root.json differ diff --git a/tests/repository_data/repository/metadata.staged/snapshot.json b/tests/repository_data/repository/metadata.staged/snapshot.json index 3ee5468c..d99849b9 100644 Binary files a/tests/repository_data/repository/metadata.staged/snapshot.json and b/tests/repository_data/repository/metadata.staged/snapshot.json differ diff --git a/tests/repository_data/repository/metadata.staged/snapshot.json.gz b/tests/repository_data/repository/metadata.staged/snapshot.json.gz index a57d0051..fd4dd5d4 100644 Binary files a/tests/repository_data/repository/metadata.staged/snapshot.json.gz and b/tests/repository_data/repository/metadata.staged/snapshot.json.gz differ diff --git a/tests/repository_data/repository/metadata.staged/targets.json b/tests/repository_data/repository/metadata.staged/targets.json index 0620bfe4..d24509a5 100644 Binary files a/tests/repository_data/repository/metadata.staged/targets.json and b/tests/repository_data/repository/metadata.staged/targets.json differ diff --git a/tests/repository_data/repository/metadata.staged/targets.json.gz b/tests/repository_data/repository/metadata.staged/targets.json.gz index 5a519066..84f938ac 100644 Binary files a/tests/repository_data/repository/metadata.staged/targets.json.gz and b/tests/repository_data/repository/metadata.staged/targets.json.gz differ diff --git a/tests/repository_data/repository/metadata.staged/timestamp.json b/tests/repository_data/repository/metadata.staged/timestamp.json index 43adf289..d620980e 100644 Binary files a/tests/repository_data/repository/metadata.staged/timestamp.json and b/tests/repository_data/repository/metadata.staged/timestamp.json differ diff --git a/tests/repository_data/repository/metadata.staged/timestamp.json.gz b/tests/repository_data/repository/metadata.staged/timestamp.json.gz index ac8247df..7cadac74 100644 Binary files a/tests/repository_data/repository/metadata.staged/timestamp.json.gz and b/tests/repository_data/repository/metadata.staged/timestamp.json.gz differ diff --git a/tests/repository_data/repository/metadata/1.root.json b/tests/repository_data/repository/metadata/1.root.json index 7835711f..87199e95 100644 Binary files a/tests/repository_data/repository/metadata/1.root.json and b/tests/repository_data/repository/metadata/1.root.json differ diff --git a/tests/repository_data/repository/metadata/1.root.json.gz b/tests/repository_data/repository/metadata/1.root.json.gz index 741b2d29..cdf8f228 100644 Binary files a/tests/repository_data/repository/metadata/1.root.json.gz and b/tests/repository_data/repository/metadata/1.root.json.gz differ diff --git a/tests/repository_data/repository/metadata/role1.json.gz b/tests/repository_data/repository/metadata/role1.json.gz index 33bdf2ea..ba2a33b2 100644 Binary files a/tests/repository_data/repository/metadata/role1.json.gz and b/tests/repository_data/repository/metadata/role1.json.gz differ diff --git a/tests/repository_data/repository/metadata/role2.json.gz b/tests/repository_data/repository/metadata/role2.json.gz index 3d23a94c..4ded997d 100644 Binary files a/tests/repository_data/repository/metadata/role2.json.gz and b/tests/repository_data/repository/metadata/role2.json.gz differ diff --git a/tests/repository_data/repository/metadata/root.json b/tests/repository_data/repository/metadata/root.json index 7835711f..87199e95 100644 Binary files a/tests/repository_data/repository/metadata/root.json and b/tests/repository_data/repository/metadata/root.json differ diff --git a/tests/repository_data/repository/metadata/snapshot.json b/tests/repository_data/repository/metadata/snapshot.json index 3ee5468c..d99849b9 100644 Binary files a/tests/repository_data/repository/metadata/snapshot.json and b/tests/repository_data/repository/metadata/snapshot.json differ diff --git a/tests/repository_data/repository/metadata/snapshot.json.gz b/tests/repository_data/repository/metadata/snapshot.json.gz index a57d0051..fd4dd5d4 100644 Binary files a/tests/repository_data/repository/metadata/snapshot.json.gz and b/tests/repository_data/repository/metadata/snapshot.json.gz differ diff --git a/tests/repository_data/repository/metadata/targets.json b/tests/repository_data/repository/metadata/targets.json index 0620bfe4..d24509a5 100644 Binary files a/tests/repository_data/repository/metadata/targets.json and b/tests/repository_data/repository/metadata/targets.json differ diff --git a/tests/repository_data/repository/metadata/targets.json.gz b/tests/repository_data/repository/metadata/targets.json.gz index 5a519066..84f938ac 100644 Binary files a/tests/repository_data/repository/metadata/targets.json.gz and b/tests/repository_data/repository/metadata/targets.json.gz differ diff --git a/tests/repository_data/repository/metadata/timestamp.json b/tests/repository_data/repository/metadata/timestamp.json index 43adf289..d620980e 100644 Binary files a/tests/repository_data/repository/metadata/timestamp.json and b/tests/repository_data/repository/metadata/timestamp.json differ diff --git a/tests/repository_data/repository/metadata/timestamp.json.gz b/tests/repository_data/repository/metadata/timestamp.json.gz index ac8247df..7cadac74 100644 Binary files a/tests/repository_data/repository/metadata/timestamp.json.gz and b/tests/repository_data/repository/metadata/timestamp.json.gz differ diff --git a/tuf/repository_lib.py b/tuf/repository_lib.py index 2425dbc6..0d56fc64 100755 --- a/tuf/repository_lib.py +++ b/tuf/repository_lib.py @@ -1548,14 +1548,11 @@ def generate_snapshot_metadata(metadata_directory, version, expiration_date, metadata_directory = _check_directory(metadata_directory) - # Set the fileinfo of 'root.json', and the versioninfo of - # 'targets.json'. 'fileinfodict' shall contain the version number of all - # available delegated roles on the repository. + # Snapshot's 'fileinfodict' shall contain the version number of Root, + # Targets, and all delegated roles fo the repository. fileinfodict = {} - root_path = os.path.join(metadata_directory, root_filename + '.json') - length, hashes = securesystemslib.util.get_file_details(root_path) - root_version = get_metadata_versioninfo('root', repository_name) - fileinfodict[ROOT_FILENAME] = tuf.formats.make_fileinfo(length, hashes, version=root_version['version']) + fileinfodict[ROOT_FILENAME] = get_metadata_versioninfo(root_filename, + repository_name) fileinfodict[TARGETS_FILENAME] = get_metadata_versioninfo(targets_filename, repository_name)