diff -r 3d3fab314c4e -r 404c18183801 librazor/transaction.c --- a/librazor/transaction.c Mon Sep 28 17:37:12 2009 +0100 +++ b/librazor/transaction.c Wed Feb 01 13:00:40 2012 +0000 @@ -1,7 +1,7 @@ /* * Copyright (C) 2008 Kristian Høgsberg * Copyright (C) 2008 Red Hat, Inc - * Copyright (C) 2009 J. Ali Harlow + * Copyright (C) 2009, 2011 J. Ali Harlow * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -109,7 +109,7 @@ { int count; - ts->set = set; + ts->set = razor_set_ref(set); count = set->packages.size / sizeof (struct razor_package); ts->packages = zalloc(count * sizeof *ts->packages); count = set->properties.size / sizeof (struct razor_property); @@ -119,6 +119,7 @@ static void transaction_set_release(struct transaction_set *ts) { + razor_set_unref(ts->set); free(ts->packages); free(ts->properties); } @@ -321,7 +322,9 @@ RAZOR_DETAIL_NAME, &n, RAZOR_DETAIL_VERSION, &v, RAZOR_DETAIL_LAST)) { +#if 0 fprintf(stderr, "removing %s-%s\n", n, v); +#endif razor_transaction_remove_package(trans, pkg); } } @@ -369,11 +372,13 @@ RAZOR_DETAIL_VERSION, &version, RAZOR_DETAIL_LAST)) { +#if 0 fprintf(stderr, "flagging %s-%s for providing %s matching %s %s\n", name, version, ppi->pool + p->name, rpi->pool + r->name, rpi->pool + r->version); +#endif flags[pkg - pkgs] |= flag; } } @@ -542,11 +547,13 @@ while (razor_package_iterator_next(&pkg_iter, &pkg, RAZOR_DETAIL_NAME, &name, RAZOR_DETAIL_LAST)) { +#if 0 fprintf(stderr, "updating %s because %s %s %s " "isn't satisfied\n", name, spi.pool + sp->name, razor_property_relation_to_string(sp), spi.pool + sp->version); +#endif trans->system.packages[pkg - spkgs] |= TRANS_PACKAGE_UPDATE; } @@ -595,9 +602,11 @@ RAZOR_DETAIL_NAME, &name, RAZOR_DETAIL_VERSION, &version, RAZOR_DETAIL_LAST)) { +#if 0 fprintf(stderr, "updating %s %s because it " "conflicts with %s\n", name, version, spi.pool + sp->name); +#endif trans->system.packages[pkg - spkgs] |= TRANS_PACKAGE_UPDATE; } @@ -640,6 +649,7 @@ rpi->present[rp - rpi->start] |= TRANS_PROPERTY_SATISFIED; +#if 0 fprintf(stderr, "pulling in %s-%s.%s which provides %s %s %s " "to satisfy %s %s %s\n", ppi->pool + pkg->name, @@ -651,6 +661,7 @@ &rpi->pool[rp->name], razor_property_relation_to_string(rp), &rpi->pool[rp->version]); +#endif trans->upstream.packages[pkg - upkgs] |= TRANS_PACKAGE_UPDATE; } @@ -736,7 +747,9 @@ RAZOR_PROPERTY_LESS, version); razor_transaction_install_package(trans, p); +#if 0 fprintf(stderr, "installing %s-%s\n", name, version); +#endif } }