1.1 --- a/src/test-driver.c	Sun Jun 29 10:55:17 2008 +0100
     1.2 +++ b/src/test-driver.c	Mon Jun 30 13:28:59 2008 -0400
     1.3 @@ -285,6 +285,23 @@
     1.4  	ctx->n_remove_pkgs = 0;
     1.5  }
     1.6  
     1.7 +static struct razor_package *
     1.8 +get_package(struct razor_set *set, const char *package)
     1.9 +{
    1.10 +	struct razor_package_iterator *pi;
    1.11 +	struct razor_package *p;
    1.12 +	const char *name, *version, *arch;
    1.13 +
    1.14 +	pi = razor_package_iterator_create(set);
    1.15 +	while (razor_package_iterator_next(pi, &p, &name, &version, &arch)) {
    1.16 +		if (strcmp(package, name) == 0)
    1.17 +			break;
    1.18 +	}
    1.19 +	razor_package_iterator_destroy(pi);
    1.20 +
    1.21 +	return p;
    1.22 +}
    1.23 +
    1.24  static void
    1.25  end_transaction(struct test_context *ctx)
    1.26  {
    1.27 @@ -293,16 +310,13 @@
    1.28  
    1.29  	ctx->trans = razor_transaction_create(ctx->system_set, ctx->repo_set);
    1.30  	for (i = 0; i < ctx->n_install_pkgs; i++) {
    1.31 -		pkg = razor_set_get_package(ctx->repo_set,
    1.32 -					    ctx->install_pkgs[i]);
    1.33 +		pkg = get_package(ctx->repo_set, ctx->install_pkgs[i]);
    1.34  		razor_transaction_install_package(ctx->trans, pkg);
    1.35  	}
    1.36  	for (i = 0; i < ctx->n_remove_pkgs; i++) {
    1.37 -		pkg = razor_set_get_package(ctx->system_set,
    1.38 -					    ctx->remove_pkgs[i]);
    1.39 +		pkg = get_package(ctx->system_set, ctx->remove_pkgs[i]);
    1.40  		if (!pkg)
    1.41 -			pkg = razor_set_get_package(ctx->repo_set,
    1.42 -						    ctx->remove_pkgs[i]);
    1.43 +			pkg = get_package(ctx->repo_set, ctx->remove_pkgs[i]);
    1.44  
    1.45  		razor_transaction_remove_package(ctx->trans, pkg);
    1.46  	}