From 70d9599246e640c011ddf0cf0e38e2a76671e722 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 4 May 2015 11:05:23 +0200 Subject: [PATCH] summary: delete summary.sig on an update Signed-off-by: Giuseppe Scrivano --- src/libostree/ostree-repo.c | 9 +++++++++ tests/test-auto-summary.sh | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index c0313fe8..4d8a7335 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -3704,6 +3704,15 @@ ostree_repo_regenerate_summary (OstreeRepo *self, error)) goto out; + if (unlinkat (self->repo_dir_fd, "summary.sig", 0) < 0) + { + if (errno != ENOENT) + { + gs_set_error_from_errno (error, errno); + goto out; + } + } + ret = TRUE; out: if (ordered_keys) diff --git a/tests/test-auto-summary.sh b/tests/test-auto-summary.sh index 0998b1e0..2452e553 100755 --- a/tests/test-auto-summary.sh +++ b/tests/test-auto-summary.sh @@ -53,3 +53,8 @@ ${CMD_PREFIX} $OSTREE commit -b test -s "Another commit..." test echo "ok commit 3" assert_not_streq "$OLD_MD5" "$(md5sum repo/summary)" + +# Check that summary --update deletes the .sig file +touch repo/summary.sig +${CMD_PREFIX} $OSTREE summary --update +assert_not_has_file repo/summary.sig