src/main.c
changeset 251 d8b3c713aa42
parent 249 061a5b815727
child 252 3e696ec612a5
     1.1 --- a/src/main.c	Fri Jun 20 16:48:44 2008 -0400
     1.2 +++ b/src/main.c	Fri Jun 20 20:57:51 2008 -0400
     1.3 @@ -644,7 +644,7 @@
     1.4  command_install(int argc, const char *argv[])
     1.5  {
     1.6  	struct razor_root *root;
     1.7 -	struct razor_set *upstream, *next;
     1.8 +	struct razor_set *system, *upstream, *next;
     1.9  	struct razor_transaction *trans;
    1.10  	int i = 0, errors, dependencies = 1;
    1.11  
    1.12 @@ -653,9 +653,10 @@
    1.13  		i++;
    1.14  	}
    1.15  
    1.16 -	root = razor_root_open(install_root, RAZOR_ROOT_OPEN_WRITE);
    1.17 +	root = razor_root_open(install_root);
    1.18 +	system = razor_root_get_system_set(root);
    1.19  	upstream = razor_set_open(rawhide_repo_filename);
    1.20 -	trans = razor_root_create_transaction(root, upstream);
    1.21 +	trans = razor_transaction_create(system, upstream);
    1.22  
    1.23  	for (; i < argc; i++) {
    1.24  		if (mark_packages_for_update(trans, upstream, argv[i]) == 0) {
    1.25 @@ -684,7 +685,7 @@
    1.26  	}
    1.27  
    1.28  	errors = 0;
    1.29 -	razor_root_diff(root, download_package, &errors);
    1.30 +	razor_set_diff(system, next, download_package, &errors);
    1.31  	if (errors > 0) {
    1.32  		fprintf(stderr, "failed to download %d packages\n", errors);
    1.33  		razor_root_close(root);
    1.34 @@ -693,7 +694,7 @@
    1.35  
    1.36  	/* FIXME: We need to figure out the right install order here,
    1.37  	 * so the post and pre scripts can run. */
    1.38 -	razor_root_diff(root, install_package, (void *) install_root);
    1.39 +	razor_set_diff(system, next, install_package, (void *) install_root);
    1.40  
    1.41  	razor_set_destroy(next);
    1.42  	razor_set_destroy(upstream);