From 2c61d942b3f83398df2c485afebc06e9e35a072a Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Fri, 27 Oct 2017 21:18:18 +0200 Subject: [PATCH] Only sync ostrees if refs are updated Signed-off-by: Patrick Uiterwijk --- roles/bodhi2/backend/files/new-updates-sync | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index c10a3ee1da..8a640f9d7e 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -116,14 +116,16 @@ def get_ostree_ref(repo, ref): def sync_ostree(dst, ref): - pre_commit = get_ostree_ref(dst, ref) - logger.info('Previous commit: %s', pre_commit) - cmd = ['ostree', 'pull-local', '--verbose', '--repo', dst, ATOMICSOURCE, ref] - out = run_command(cmd) - logger.info('Ostree output: %s', out) - post_commit = get_ostree_ref(dst, ref) - logger.info('New commit: %s', post_commit) - if pre_commit != post_commit: + src_commit = get_ostree_ref(ATOMICSOURCE, ref) + dst_commit = get_ostree_ref(dst, ref) + if src_commit == dst_commit: + logger.info('OSTree at %s, ref %s in sync', dst, ref) + else: + logger.info('Syncing OSTree to %s, ref %s: %s -> %s', + dst, ref, src_commit, dst_commit) + cmd = ['ostree', 'pull-local', '--verbose', '--repo', + dst, ATOMICSOURCE, ref] + out = run_command(cmd) cmd = ['ostree', 'summary', '--verbose', '--repo', dst, '--update'] run_command(cmd)