From f5f7fe5e9acc46d8caa212b071d4f17673a8e44c Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 5 Sep 2013 15:30:15 -0400 Subject: [PATCH] repo: Make the ordering consistent between abort/complete_transaction This just makes the functions nicer to stare at. https://bugzilla.gnome.org/show_bug.cgi?id=707644 --- src/libostree/ostree-repo.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index aaee9a1f..1b60474a 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -1264,14 +1264,14 @@ ostree_repo_commit_transaction_with_stats (OstreeRepo *self, if (!cleanup_tmpdir (self, cancellable, error)) goto out; - if (!ot_gfile_ensure_unlinked (self->transaction_lock_path, cancellable, error)) - goto out; - if (self->loose_object_devino_hash) g_hash_table_remove_all (self->loose_object_devino_hash); self->in_transaction = FALSE; + if (!ot_gfile_ensure_unlinked (self->transaction_lock_path, cancellable, error)) + goto out; + if (out_metadata_objects_total) *out_metadata_objects_total = self->txn_metadata_objects_total; if (out_metadata_objects_written) *out_metadata_objects_written = self->txn_metadata_objects_written; if (out_content_objects_total) *out_content_objects_total = self->txn_content_objects_total; @@ -1302,10 +1302,11 @@ ostree_repo_abort_transaction (OstreeRepo *self, if (!cleanup_tmpdir (self, cancellable, error)) goto out; - self->in_transaction = FALSE; if (self->loose_object_devino_hash) g_hash_table_remove_all (self->loose_object_devino_hash); + self->in_transaction = FALSE; + ret = TRUE; out: return ret;