diff -r e63951c1d0f8 -r 8cbc438cc298 src/rpm.c
--- a/src/rpm.c	Thu Nov 10 10:35:21 2011 +0000
+++ b/src/rpm.c	Thu Feb 16 17:33:47 2012 +0000
@@ -465,23 +465,21 @@
 static void
 command_query(int argc, const char *argv[])
 {
-	struct razor_atomic *atomic;
+	struct razor_error *error = NULL;
 	struct razor_set *set;
 	struct razor_package_iterator *pi;
 	struct razor_package *package;
 	const char *name, *version, *arch;
 
-	atomic = razor_atomic_open("Query packages");
 	if (option_package) {
 		set = create_set_from_command_line(argc, argv);
 		argc = 0;
 		option_all = 1;
 	} else {
-		set = razor_root_open_read_only(option_root, atomic);
+		set = razor_root_open_read_only(option_root, &error);
 		if (!set) {
-			fprintf(stderr, "%s\n",
-				razor_atomic_get_error_msg(atomic));
-			razor_atomic_destroy(atomic);
+			fprintf(stderr, "%s\n", razor_error_get_msg(error));
+			razor_error_free(error);
 			return;
 		}
 	}
@@ -521,29 +519,26 @@
 	razor_package_iterator_destroy(pi);
 
 	razor_set_unref(set);
-	razor_atomic_destroy(atomic);
 }
 
 static void
 command_verify(int argc, const char *argv[])
 {
-	struct razor_atomic *atomic;
+	struct razor_error *error = NULL;
 	struct razor_set *set;
 	struct razor_package_iterator *pi;
 	struct razor_package *package;
 	const char *name, *version, *arch;
 
-	atomic = razor_atomic_open("Verify packages");
 	if (option_package) {
 		set = create_set_from_command_line(argc, argv);
 		argc = 0;
 		option_all = 1;
 	} else {
-		set = razor_root_open_read_only(option_root, atomic);
+		set = razor_root_open_read_only(option_root, &error);
 		if (!set) {
-			fprintf(stderr, "%s\n",
-				razor_atomic_get_error_msg(atomic));
-			razor_atomic_destroy(atomic);
+			fprintf(stderr, "%s\n", razor_error_get_msg(error));
+			razor_error_free(error);
 			return;
 		}
 	}
@@ -560,7 +555,6 @@
 	}
 
 	razor_package_iterator_destroy(pi);
-	razor_atomic_destroy(atomic);
 }
 
 static void
@@ -580,7 +574,7 @@
 static void
 command_erase(int argc, const char *argv[])
 {
-	struct razor_atomic *atomic;
+	struct razor_error *error = NULL;
 	struct razor_set *set, *upstream, *next;
 	struct razor_transaction *trans;
 	struct razor_package_query *query;
@@ -592,15 +586,12 @@
 		exit(1);
 	}
 
-	atomic = razor_atomic_open("Erase packages");
-
-	set = razor_set_open(repo_filename, atomic);
-	if (!set || razor_atomic_commit(atomic)) {
-		fprintf(stderr, "%s\n", razor_atomic_get_error_msg(atomic));
-		razor_atomic_destroy(atomic);
+	set = razor_set_open(repo_filename, RAZOR_SET_PRIVATE, &error);
+	if (!set) {
+		fprintf(stderr, "%s\n", razor_error_get_msg(error));
+		razor_error_free(error);
 		exit(1);
 	}
-	razor_atomic_destroy(atomic);
 	upstream = razor_set_create();
 
 	trans = razor_transaction_create(set, upstream);
@@ -639,7 +630,7 @@
 static void
 command_install(int argc, const char *argv[])
 {
-	struct razor_atomic *atomic;
+	struct razor_error *error = NULL;
 	struct razor_set *set, *upstream, *next;
 	struct razor_transaction *trans;
 	struct razor_package_iterator *pi;
@@ -650,14 +641,11 @@
 		exit(1);
 	}
 
-	atomic = razor_atomic_open("Install packages");
-
-	set = razor_set_open(repo_filename, atomic);
-	if (!set || razor_atomic_commit(atomic)) {
-		fprintf(stderr, "%s\n", razor_atomic_get_error_msg(atomic));
-		razor_atomic_destroy(atomic);
+	set = razor_set_open(repo_filename, RAZOR_SET_PRIVATE, &error);
+	if (!set) {
+		fprintf(stderr, "%s\n", razor_error_get_msg(error));
+		razor_error_free(error);
 	}
-	razor_atomic_destroy(atomic);
 	upstream = create_set_from_command_line(argc, argv);
 
 	trans = razor_transaction_create(set, upstream);
@@ -693,7 +681,7 @@
 static void
 command_update(int argc, const char *argv[])
 {
-	struct razor_atomic *atomic;
+	struct razor_error *error = NULL;
 	struct razor_set *set, *upstream, *next;
 	struct razor_transaction *trans;
 	struct razor_package_iterator *pi;
@@ -704,14 +692,11 @@
 		exit(1);
 	}
 
-	atomic = razor_atomic_open("Update packages");
-
-	set = razor_set_open(repo_filename, atomic);
-	if (!set || razor_atomic_commit(atomic)) {
-		fprintf(stderr, "%s\n", razor_atomic_get_error_msg(atomic));
-		razor_atomic_destroy(atomic);
+	set = razor_set_open(repo_filename, RAZOR_SET_PRIVATE, &error);
+	if (!set) {
+		fprintf(stderr, "%s\n", razor_error_get_msg(error));
+		razor_error_free(error);
 	}
-	razor_atomic_destroy(atomic);
 	upstream = create_set_from_command_line(argc, argv);
 
 	trans = razor_transaction_create(set, upstream);