From 59ffce73c8c386f70c850f318934f1581ef05e7a Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 7 Jun 2017 14:32:29 +0100 Subject: [PATCH] lib/repo: Omit deltas from the summary file if there are none MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Closes: #911 Approved by: cgwalters --- src/libostree/ostree-repo.c | 3 ++- tests/test-summary-view.sh | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index c1aedb91..0d20c25b 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -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 (&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)); } { diff --git a/tests/test-summary-view.sh b/tests/test-summary-view.sh index 5b52b691..60855eb1 100755 --- a/tests/test-summary-view.sh +++ b/tests/test-summary-view.sh @@ -51,7 +51,6 @@ ${OSTREE} summary --view > summary.txt assert_file_has_content_literal summary.txt "* main" 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 "Static Deltas (ostree.static-deltas): {}" assert_file_has_content_literal summary.txt "Timestamp (ostree.commit.timestamp): " echo "ok view summary"