lib/repo: Omit deltas from the summary file if there are none

If there are no deltas to be listed in the summary file, don’t bother
including the key for them in the additional metadata section of the
file. This saves a few bytes in some cases.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Closes: #911
Approved by: cgwalters
This commit is contained in:
Philip Withnall authored and Atomic Bot committed 2017-06-07 16:55:35 +00:00
1 parent 7ce6777028
commit 59ffce73c8
2 files changed
+2 -2

No files matched your search

+2 -1
View File
@@ -4561,7 +4561,8 @@ ostree_repo_regenerate_summary (OstreeRepo *self,
g_variant_dict_insert_value (&deltas_builder, delta_names->pdata[i], ot_gvariant_new_bytearray (csum, 32)); g_variant_dict_insert_value (&deltas_builder, delta_names->pdata[i], ot_gvariant_new_bytearray (csum, 32));
} }
g_variant_dict_insert_value (&additional_metadata_builder, OSTREE_SUMMARY_STATIC_DELTAS, g_variant_dict_end (&deltas_builder)); if (delta_names->len > 0)
g_variant_dict_insert_value (&additional_metadata_builder, OSTREE_SUMMARY_STATIC_DELTAS, g_variant_dict_end (&deltas_builder));
} }
{ {
-1
View File
@@ -51,7 +51,6 @@ ${OSTREE} summary --view > summary.txt
assert_file_has_content_literal summary.txt "* main" assert_file_has_content_literal summary.txt "* main"
assert_file_has_content_literal summary.txt "* other" assert_file_has_content_literal summary.txt "* other"
assert_file_has_content_literal summary.txt "ostree.summary.last-modified" assert_file_has_content_literal summary.txt "ostree.summary.last-modified"
assert_file_has_content_literal summary.txt "Static Deltas (ostree.static-deltas): {}"
assert_file_has_content_literal summary.txt "Timestamp (ostree.commit.timestamp): " assert_file_has_content_literal summary.txt "Timestamp (ostree.commit.timestamp): "
echo "ok view summary" echo "ok view summary"