From d9334fdc24aa6ca34dc5cfd4cba88b0a87b22c35 Mon Sep 17 00:00:00 2001 From: J. Ali Harlow Date: Sat, 11 Feb 2012 09:34:40 +0000 Subject: [PATCH] Fix object management in error paths --- src/main.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main.c b/src/main.c index 2259596..032238c 100644 --- a/src/main.c +++ b/src/main.c @@ -1031,7 +1031,7 @@ update_system(const char *install_root, struct razor_relocations *relocations, relocations, RAZOR_STAGE_SCRIPTS_PRE); if (r < 0) { fprintf(stderr, "%s aborted\n", verb); - razor_atomic_destroy(atomic); + razor_root_close(root); retval = r; } else { razor_install_iterator_seek(ii, pos); @@ -1047,11 +1047,10 @@ update_system(const char *install_root, struct razor_relocations *relocations, (void)razor_root_commit(root); retval = razor_atomic_commit(atomic); - if (retval) { + if (retval) fprintf(stderr, "%s\n", razor_atomic_get_error_msg(atomic)); - razor_atomic_destroy(atomic); - } else { + else { razor_install_iterator_seek(ii, pos); update_packages(trans, ii, system, next, atomic, relocations, -- 1.7.1