Merge commit 'jbowes/master'

diff --cc librazor/importer.c
Simple merge

diff --cc librazor/razor.c
Simple merge

diff --cc librazor/razor.h
Simple merge

diff --cc librazor/root.c
Simple merge

diff --cc librazor/rpm.c
Simple merge

diff --cc src/import-rpmdb.c
Simple merge

diff --cc src/import-yum.c
Simple merge

diff --cc src/main.c
index 914e8a8,15b3b6e..f9aee35
--- 1/src/main.c
--- 2/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");