summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2008-06-19 00:32:24 -0400
committerKristian Høgsberg <krh@redhat.com>2008-06-19 00:32:24 -0400
commitc646549b9b19d89de74b0af01b1ad2e92ee2e6e3 (patch)
tree23812ee6109512d76fe1ccde250d3c460a01acc7 /src
parentfc8154dd5a5af9f2e61fe023c0946dc70ddab9c2 (diff)
Make razor install work again after the razor_root changes.
Diffstat (limited to 'src')
-rw-r--r--src/main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c
index 772231b..05d5b53 100644
--- a/src/main.c
+++ b/src/main.c
@@ -657,8 +657,8 @@ command_install(int argc, const char *argv[])
}
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 @@ command_install(int argc, const char *argv[])
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 @@ command_install(int argc, const char *argv[])
/* 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);