main.c
changeset 210 c78f677d96b8
parent 208 7b460017c221
child 211 cf0ca962262b
     1.1 --- a/main.c	Mon Apr 07 23:52:14 2008 -0400
     1.2 +++ b/main.c	Tue Apr 08 23:53:57 2008 -0400
     1.3 @@ -421,7 +421,7 @@
     1.4  		}
     1.5  	}
     1.6  		
     1.7 -	errors = razor_transaction_describe(trans);
     1.8 +	errors = razor_transaction_resolve(trans);
     1.9  	if (errors)
    1.10  		return 1;
    1.11  
    1.12 @@ -453,7 +453,7 @@
    1.13  		}
    1.14  	}
    1.15  
    1.16 -	errors = razor_transaction_describe(trans);
    1.17 +	errors = razor_transaction_resolve(trans);
    1.18  	if (errors)
    1.19  		return 1;
    1.20  
    1.21 @@ -626,7 +626,12 @@
    1.22  	struct razor_set *system, *upstream, *next;
    1.23  	struct razor_transaction *trans;
    1.24  	char path[PATH_MAX], new_path[PATH_MAX];
    1.25 -	int i, errors, fd;
    1.26 +	int i = 0, errors, fd, dependencies = 1;
    1.27 +
    1.28 +	if (i < argc && strcmp(argv[i], "--no-dependencies") == 0) {
    1.29 +		dependencies = 0;
    1.30 +		i++;
    1.31 +	}
    1.32  
    1.33  	/* Create the new next repo file up front to ensure exclusive
    1.34  	 * access. */
    1.35 @@ -653,7 +658,7 @@
    1.36  		return 1;
    1.37  	}
    1.38  	trans = razor_transaction_create(system, upstream);
    1.39 -	for (i = 0; i < argc; i++) {
    1.40 +	for (; i < argc; i++) {
    1.41  		if (mark_packages_for_update(trans, upstream, argv[i]) == 0) {
    1.42  			fprintf(stderr, "no package matched %s\n", argv[i]);
    1.43  			unlink(new_path);
    1.44 @@ -661,10 +666,12 @@
    1.45  		}
    1.46  	}
    1.47  
    1.48 -	errors = razor_transaction_describe(trans);
    1.49 -	if (errors) {
    1.50 -		unlink(new_path);
    1.51 -		return 1;
    1.52 +	if (dependencies) {
    1.53 +		errors = razor_transaction_resolve(trans);
    1.54 +		if (errors) {
    1.55 +			unlink(new_path);
    1.56 +			return 1;
    1.57 +		}
    1.58  	}
    1.59  
    1.60  	next = razor_transaction_finish(trans);