1.1 --- a/src/rpm.c Thu Nov 10 10:35:21 2011 +0000
1.2 +++ b/src/rpm.c Thu Feb 16 17:33:47 2012 +0000
1.3 @@ -465,23 +465,21 @@
1.4 static void
1.5 command_query(int argc, const char *argv[])
1.6 {
1.7 - struct razor_atomic *atomic;
1.8 + struct razor_error *error = NULL;
1.9 struct razor_set *set;
1.10 struct razor_package_iterator *pi;
1.11 struct razor_package *package;
1.12 const char *name, *version, *arch;
1.13
1.14 - atomic = razor_atomic_open("Query packages");
1.15 if (option_package) {
1.16 set = create_set_from_command_line(argc, argv);
1.17 argc = 0;
1.18 option_all = 1;
1.19 } else {
1.20 - set = razor_root_open_read_only(option_root, atomic);
1.21 + set = razor_root_open_read_only(option_root, &error);
1.22 if (!set) {
1.23 - fprintf(stderr, "%s\n",
1.24 - razor_atomic_get_error_msg(atomic));
1.25 - razor_atomic_destroy(atomic);
1.26 + fprintf(stderr, "%s\n", razor_error_get_msg(error));
1.27 + razor_error_free(error);
1.28 return;
1.29 }
1.30 }
1.31 @@ -521,29 +519,26 @@
1.32 razor_package_iterator_destroy(pi);
1.33
1.34 razor_set_unref(set);
1.35 - razor_atomic_destroy(atomic);
1.36 }
1.37
1.38 static void
1.39 command_verify(int argc, const char *argv[])
1.40 {
1.41 - struct razor_atomic *atomic;
1.42 + struct razor_error *error = NULL;
1.43 struct razor_set *set;
1.44 struct razor_package_iterator *pi;
1.45 struct razor_package *package;
1.46 const char *name, *version, *arch;
1.47
1.48 - atomic = razor_atomic_open("Verify packages");
1.49 if (option_package) {
1.50 set = create_set_from_command_line(argc, argv);
1.51 argc = 0;
1.52 option_all = 1;
1.53 } else {
1.54 - set = razor_root_open_read_only(option_root, atomic);
1.55 + set = razor_root_open_read_only(option_root, &error);
1.56 if (!set) {
1.57 - fprintf(stderr, "%s\n",
1.58 - razor_atomic_get_error_msg(atomic));
1.59 - razor_atomic_destroy(atomic);
1.60 + fprintf(stderr, "%s\n", razor_error_get_msg(error));
1.61 + razor_error_free(error);
1.62 return;
1.63 }
1.64 }
1.65 @@ -560,7 +555,6 @@
1.66 }
1.67
1.68 razor_package_iterator_destroy(pi);
1.69 - razor_atomic_destroy(atomic);
1.70 }
1.71
1.72 static void
1.73 @@ -580,7 +574,7 @@
1.74 static void
1.75 command_erase(int argc, const char *argv[])
1.76 {
1.77 - struct razor_atomic *atomic;
1.78 + struct razor_error *error = NULL;
1.79 struct razor_set *set, *upstream, *next;
1.80 struct razor_transaction *trans;
1.81 struct razor_package_query *query;
1.82 @@ -592,15 +586,12 @@
1.83 exit(1);
1.84 }
1.85
1.86 - atomic = razor_atomic_open("Erase packages");
1.87 -
1.88 - set = razor_set_open(repo_filename, atomic);
1.89 - if (!set || razor_atomic_commit(atomic)) {
1.90 - fprintf(stderr, "%s\n", razor_atomic_get_error_msg(atomic));
1.91 - razor_atomic_destroy(atomic);
1.92 + set = razor_set_open(repo_filename, RAZOR_SET_PRIVATE, &error);
1.93 + if (!set) {
1.94 + fprintf(stderr, "%s\n", razor_error_get_msg(error));
1.95 + razor_error_free(error);
1.96 exit(1);
1.97 }
1.98 - razor_atomic_destroy(atomic);
1.99 upstream = razor_set_create();
1.100
1.101 trans = razor_transaction_create(set, upstream);
1.102 @@ -639,7 +630,7 @@
1.103 static void
1.104 command_install(int argc, const char *argv[])
1.105 {
1.106 - struct razor_atomic *atomic;
1.107 + struct razor_error *error = NULL;
1.108 struct razor_set *set, *upstream, *next;
1.109 struct razor_transaction *trans;
1.110 struct razor_package_iterator *pi;
1.111 @@ -650,14 +641,11 @@
1.112 exit(1);
1.113 }
1.114
1.115 - atomic = razor_atomic_open("Install packages");
1.116 -
1.117 - set = razor_set_open(repo_filename, atomic);
1.118 - if (!set || razor_atomic_commit(atomic)) {
1.119 - fprintf(stderr, "%s\n", razor_atomic_get_error_msg(atomic));
1.120 - razor_atomic_destroy(atomic);
1.121 + set = razor_set_open(repo_filename, RAZOR_SET_PRIVATE, &error);
1.122 + if (!set) {
1.123 + fprintf(stderr, "%s\n", razor_error_get_msg(error));
1.124 + razor_error_free(error);
1.125 }
1.126 - razor_atomic_destroy(atomic);
1.127 upstream = create_set_from_command_line(argc, argv);
1.128
1.129 trans = razor_transaction_create(set, upstream);
1.130 @@ -693,7 +681,7 @@
1.131 static void
1.132 command_update(int argc, const char *argv[])
1.133 {
1.134 - struct razor_atomic *atomic;
1.135 + struct razor_error *error = NULL;
1.136 struct razor_set *set, *upstream, *next;
1.137 struct razor_transaction *trans;
1.138 struct razor_package_iterator *pi;
1.139 @@ -704,14 +692,11 @@
1.140 exit(1);
1.141 }
1.142
1.143 - atomic = razor_atomic_open("Update packages");
1.144 -
1.145 - set = razor_set_open(repo_filename, atomic);
1.146 - if (!set || razor_atomic_commit(atomic)) {
1.147 - fprintf(stderr, "%s\n", razor_atomic_get_error_msg(atomic));
1.148 - razor_atomic_destroy(atomic);
1.149 + set = razor_set_open(repo_filename, RAZOR_SET_PRIVATE, &error);
1.150 + if (!set) {
1.151 + fprintf(stderr, "%s\n", razor_error_get_msg(error));
1.152 + razor_error_free(error);
1.153 }
1.154 - razor_atomic_destroy(atomic);
1.155 upstream = create_set_from_command_line(argc, argv);
1.156
1.157 trans = razor_transaction_create(set, upstream);