From: James Bowes Date: Sun, 8 Jun 2008 15:56:11 +0000 (-0400) Subject: Clean up some segfaults in the test driver X-Git-Tag: 0.1~113^2~7 X-Git-Url: http://project.juiblex.co.uk/git/?a=commitdiff_plain;h=6b8b00f4b58bd1e42251e49bc51fd4ffec9787b7;p=razor.git Clean up some segfaults in the test driver --- diff --git a/test-driver.c b/test-driver.c index 8ff184e..54dbde7 100644 --- a/test-driver.c +++ b/test-driver.c @@ -262,8 +262,12 @@ end_transaction(struct test_context *ctx) razor_transaction_install_package(ctx->trans, pkg); } for (i = 0; i < ctx->n_remove_pkgs; i++) { - pkg = razor_set_get_package(ctx->repo_set, + pkg = razor_set_get_package(ctx->system_set, ctx->remove_pkgs[i]); + if (!pkg) + pkg = razor_set_get_package(ctx->repo_set, + ctx->remove_pkgs[i]); + razor_transaction_remove_package(ctx->trans, pkg); } @@ -278,6 +282,7 @@ end_transaction(struct test_context *ctx) if (!errors) { struct razor_set *new; new = razor_transaction_finish(ctx->trans); + ctx->trans = NULL; ctx->system_set = new; } }