1.1 --- a/librazor/transaction.c Sun Jun 29 17:32:19 2008 +0100
1.2 +++ b/librazor/transaction.c Mon Jun 30 09:47:32 2008 +0100
1.3 @@ -294,7 +294,7 @@
1.4 struct razor_package *pkg, *pkgs;
1.5 struct razor_package_iterator pkg_iter;
1.6 struct razor_set *set;
1.7 - const char *n, *v, *a;
1.8 + const char *n, *v;
1.9 uint32_t type;
1.10
1.11 if (ppi->present == trans->system.properties)
1.12 @@ -316,8 +316,9 @@
1.13 continue;
1.14
1.15 razor_package_iterator_init_for_property(&pkg_iter, set, p);
1.16 - while (razor_package_iterator_next(&pkg_iter,
1.17 - &pkg, &n, &v, &a)) {
1.18 + while (razor_package_iterator_next(&pkg_iter, &pkg,
1.19 + RAZOR_DETAIL_NAME, &n,
1.20 + RAZOR_DETAIL_VERSION, &v, 0)) {
1.21 fprintf(stderr, "removing %s-%s\n", n, v);
1.22 razor_transaction_remove_package(trans, pkg);
1.23 }
1.24 @@ -335,7 +336,7 @@
1.25 struct razor_package *pkg, *pkgs;
1.26 struct razor_package_iterator pkg_iter;
1.27 struct razor_set *set;
1.28 - const char *name, *version, *arch;
1.29 + const char *name, *version;
1.30 uint32_t *flags, type;
1.31
1.32 if (ppi->present == trans->system.properties) {
1.33 @@ -362,7 +363,8 @@
1.34
1.35 razor_package_iterator_init_for_property(&pkg_iter, set, p);
1.36 while (razor_package_iterator_next(&pkg_iter, &pkg,
1.37 - &name, &version, &arch)) {
1.38 + RAZOR_DETAIL_NAME, &name,
1.39 + RAZOR_DETAIL_VERSION, &version, 0)) {
1.40
1.41 fprintf(stderr, "flagging %s-%s for providing %s matching %s %s\n",
1.42 name, version,
1.43 @@ -511,7 +513,7 @@
1.44 struct razor_property *sp;
1.45 struct prop_iter spi;
1.46 struct razor_package_iterator pkg_iter;
1.47 - const char *name, *version, *arch;
1.48 + const char *name;
1.49
1.50 spkgs = trans->system.set->packages.data;
1.51 prop_iter_init(&spi, &trans->system);
1.52 @@ -524,7 +526,7 @@
1.53 trans->system.set,
1.54 sp);
1.55 while (razor_package_iterator_next(&pkg_iter, &pkg,
1.56 - &name, &version, &arch)) {
1.57 + RAZOR_DETAIL_NAME, &name, 0)) {
1.58 fprintf(stderr, "updating %s because %s %s %s "
1.59 "isn't satisfied\n",
1.60 name, spi.pool + sp->name,
1.61 @@ -556,7 +558,7 @@
1.62 struct razor_property *up, *sp;
1.63 struct prop_iter spi, upi;
1.64 struct razor_package_iterator pkg_iter;
1.65 - const char *name, *version, *arch;
1.66 + const char *name, *version;
1.67
1.68 spkgs = trans->system.set->packages.data;
1.69 prop_iter_init(&spi, &trans->system);
1.70 @@ -575,7 +577,8 @@
1.71 trans->system.set,
1.72 sp);
1.73 while (razor_package_iterator_next(&pkg_iter, &pkg,
1.74 - &name, &version, &arch)) {
1.75 + RAZOR_DETAIL_NAME, &name,
1.76 + RAZOR_DETAIL_VERSION, &version, 0)) {
1.77 fprintf(stderr, "updating %s %s because it "
1.78 "conflicts with %s\n",
1.79 name, version, spi.pool + sp->name);
1.80 @@ -657,13 +660,15 @@
1.81 struct razor_package_iterator *pi;
1.82 struct razor_package *p, *pkg, *spkgs;
1.83 struct prop_iter ppi;
1.84 - const char *name, *version, *arch;
1.85 + const char *name, *version;
1.86
1.87 spkgs = trans->system.set->packages.data;
1.88 pi = razor_package_iterator_create(trans->system.set);
1.89 prop_iter_init(&ppi, &trans->upstream);
1.90
1.91 - while (razor_package_iterator_next(pi, &p, &name, &version, &arch)) {
1.92 + while (razor_package_iterator_next(pi, &p,
1.93 + RAZOR_DETAIL_NAME, &name,
1.94 + RAZOR_DETAIL_VERSION, &version, 0)) {
1.95 if (!(trans->system.packages[p - spkgs] & TRANS_PACKAGE_UPDATE))
1.96 continue;
1.97
1.98 @@ -692,13 +697,15 @@
1.99 struct razor_package_iterator *pi;
1.100 struct razor_package *p, *upkgs;
1.101 struct prop_iter spi;
1.102 - const char *name, *version, *arch;
1.103 + const char *name, *version;
1.104
1.105 upkgs = trans->upstream.set->packages.data;
1.106 pi = razor_package_iterator_create(trans->upstream.set);
1.107 prop_iter_init(&spi, &trans->system);
1.108
1.109 - while (razor_package_iterator_next(pi, &p, &name, &version, &arch)) {
1.110 + while (razor_package_iterator_next(pi, &p,
1.111 + RAZOR_DETAIL_NAME, &name,
1.112 + RAZOR_DETAIL_VERSION, &version, 0)) {
1.113 if (!(trans->upstream.packages[p - upkgs] & TRANS_PACKAGE_UPDATE))
1.114 continue;
1.115
1.116 @@ -745,14 +752,18 @@
1.117 if (pool[rp->version] == '\0') {
1.118 razor_package_iterator_init_for_property(&pi, set, rp);
1.119 while (razor_package_iterator_next(&pi, &pkg,
1.120 - &name, &version, &arch))
1.121 + RAZOR_DETAIL_NAME, &name,
1.122 + RAZOR_DETAIL_VERSION, &version,
1.123 + RAZOR_DETAIL_ARCH, &arch, 0))
1.124 fprintf(stderr, "%s is needed by %s-%s.%s\n",
1.125 &pool[rp->name],
1.126 name, version, arch);
1.127 } else {
1.128 razor_package_iterator_init_for_property(&pi, set, rp);
1.129 while (razor_package_iterator_next(&pi, &pkg,
1.130 - &name, &version, &arch))
1.131 + RAZOR_DETAIL_NAME, &name,
1.132 + RAZOR_DETAIL_VERSION, &version,
1.133 + RAZOR_DETAIL_ARCH, &arch, 0))
1.134 fprintf(stderr, "%s %s %s is needed by %s-%s.%s\n",
1.135 &pool[rp->name],
1.136 razor_property_relation_to_string(rp),