From: Kristian Høgsberg <krh@redhat.com>
Date: Mon, 23 Jun 2008 13:59:08 +0000 (-0400)
Subject: Merge commit 'jbowes/master'
X-Git-Tag: 0.1~113
X-Git-Url: http://project.juiblex.co.uk/git/?a=commitdiff_plain;h=e7a9df418a6b680878e8e3c0b0129d0b07326ff0;p=razor.git

Merge commit 'jbowes/master'
---

e7a9df418a6b680878e8e3c0b0129d0b07326ff0
diff --cc src/main.c
index 914e8a8,15b3b6e..f9aee35
--- a/src/main.c
+++ b/src/main.c
@@@ -439,15 -446,12 +446,15 @@@ command_update(int argc, const char *ar
  		}
  	}
  
 -	errors = razor_transaction_resolve(trans);
 -	if (errors)
 +	razor_transaction_resolve(trans);
 +	errors = razor_transaction_describe(trans);
 +	if (errors) {
 +		fprintf(stderr, "unresolved dependencies\n");
  		return 1;
 +	}
  
  	set = razor_transaction_finish(trans);
- 	razor_set_write(set, updated_repo_filename);
+ 	razor_set_write(set, updated_repo_filename, RAZOR_REPO_FILE_MAIN);
  	razor_set_destroy(set);
  	razor_set_destroy(upstream);
  	printf("wrote system-updated.repo\n");