# HG changeset patch # User Kristian H?gsberg # Date 1213849944 14400 # Node ID 0311b3fe72e3e503ac03f77753f2d34c97c466df # Parent 708a3d9c759a7bbc599344874dfa58be20a84121 Make razor install work again after the razor_root changes. diff -r 708a3d9c759a -r 0311b3fe72e3 src/main.c --- a/src/main.c Mon Jun 16 22:35:09 2008 -0400 +++ b/src/main.c Thu Jun 19 00:32:24 2008 -0400 @@ -657,8 +657,8 @@ } if (dependencies) { - errors = razor_transaction_resolve(trans); - if (errors) { + razor_transaction_resolve(trans); + if (razor_transaction_describe(trans) > 0) { razor_root_close(root); return 1; } @@ -674,6 +674,7 @@ return 1; } + errors = 0; razor_root_diff(root, download_package, &errors); if (errors > 0) { fprintf(stderr, "failed to download %d packages\n", errors); @@ -683,7 +684,7 @@ /* FIXME: We need to figure out the right install order here, * so the post and pre scripts can run. */ - razor_root_diff(root, install_package, (void *) root); + razor_root_diff(root, install_package, (void *) install_root); razor_set_destroy(next); razor_set_destroy(upstream);