1.1 --- a/librazor/transaction.c Mon Sep 28 17:37:12 2009 +0100
1.2 +++ b/librazor/transaction.c Wed Feb 01 12:46:39 2012 +0000
1.3 @@ -1,7 +1,7 @@
1.4 /*
1.5 * Copyright (C) 2008 Kristian Høgsberg <krh@redhat.com>
1.6 * Copyright (C) 2008 Red Hat, Inc
1.7 - * Copyright (C) 2009 J. Ali Harlow <ali@juiblex.co.uk>
1.8 + * Copyright (C) 2009, 2011 J. Ali Harlow <ali@juiblex.co.uk>
1.9 *
1.10 * This program is free software; you can redistribute it and/or modify
1.11 * it under the terms of the GNU General Public License as published by
1.12 @@ -109,7 +109,7 @@
1.13 {
1.14 int count;
1.15
1.16 - ts->set = set;
1.17 + ts->set = razor_set_ref(set);
1.18 count = set->packages.size / sizeof (struct razor_package);
1.19 ts->packages = zalloc(count * sizeof *ts->packages);
1.20 count = set->properties.size / sizeof (struct razor_property);
1.21 @@ -119,6 +119,7 @@
1.22 static void
1.23 transaction_set_release(struct transaction_set *ts)
1.24 {
1.25 + razor_set_unref(ts->set);
1.26 free(ts->packages);
1.27 free(ts->properties);
1.28 }
1.29 @@ -321,7 +322,9 @@
1.30 RAZOR_DETAIL_NAME, &n,
1.31 RAZOR_DETAIL_VERSION, &v,
1.32 RAZOR_DETAIL_LAST)) {
1.33 +#if 0
1.34 fprintf(stderr, "removing %s-%s\n", n, v);
1.35 +#endif
1.36 razor_transaction_remove_package(trans, pkg);
1.37 }
1.38 }
1.39 @@ -369,11 +372,13 @@
1.40 RAZOR_DETAIL_VERSION, &version,
1.41 RAZOR_DETAIL_LAST)) {
1.42
1.43 +#if 0
1.44 fprintf(stderr, "flagging %s-%s for providing %s matching %s %s\n",
1.45 name, version,
1.46 ppi->pool + p->name,
1.47 rpi->pool + r->name,
1.48 rpi->pool + r->version);
1.49 +#endif
1.50 flags[pkg - pkgs] |= flag;
1.51 }
1.52 }
1.53 @@ -542,11 +547,13 @@
1.54 while (razor_package_iterator_next(&pkg_iter, &pkg,
1.55 RAZOR_DETAIL_NAME, &name,
1.56 RAZOR_DETAIL_LAST)) {
1.57 +#if 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 razor_property_relation_to_string(sp),
1.62 spi.pool + sp->version);
1.63 +#endif
1.64 trans->system.packages[pkg - spkgs] |=
1.65 TRANS_PACKAGE_UPDATE;
1.66 }
1.67 @@ -595,9 +602,11 @@
1.68 RAZOR_DETAIL_NAME, &name,
1.69 RAZOR_DETAIL_VERSION, &version,
1.70 RAZOR_DETAIL_LAST)) {
1.71 +#if 0
1.72 fprintf(stderr, "updating %s %s because it "
1.73 "conflicts with %s\n",
1.74 name, version, spi.pool + sp->name);
1.75 +#endif
1.76 trans->system.packages[pkg - spkgs] |=
1.77 TRANS_PACKAGE_UPDATE;
1.78 }
1.79 @@ -640,6 +649,7 @@
1.80
1.81 rpi->present[rp - rpi->start] |= TRANS_PROPERTY_SATISFIED;
1.82
1.83 +#if 0
1.84 fprintf(stderr, "pulling in %s-%s.%s which provides %s %s %s "
1.85 "to satisfy %s %s %s\n",
1.86 ppi->pool + pkg->name,
1.87 @@ -651,6 +661,7 @@
1.88 &rpi->pool[rp->name],
1.89 razor_property_relation_to_string(rp),
1.90 &rpi->pool[rp->version]);
1.91 +#endif
1.92
1.93 trans->upstream.packages[pkg - upkgs] |= TRANS_PACKAGE_UPDATE;
1.94 }
1.95 @@ -736,7 +747,9 @@
1.96 RAZOR_PROPERTY_LESS,
1.97 version);
1.98 razor_transaction_install_package(trans, p);
1.99 +#if 0
1.100 fprintf(stderr, "installing %s-%s\n", name, version);
1.101 +#endif
1.102 }
1.103 }
1.104