From: Michael Schroeder Date: Mon, 25 Jun 2012 09:28:31 +0000 (+0200) Subject: - export repo_add_cudf, use SOLVER_ORUPDATE for cudf update jobs X-Git-Tag: BASE-SuSE-Code-12_2-Branch~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d103a9643eb152b38260e3325a9a9a497bdf9455;p=thirdparty%2Flibsolv.git - export repo_add_cudf, use SOLVER_ORUPDATE for cudf update jobs --- diff --git a/ext/libsolvext.ver b/ext/libsolvext.ver index 77969251..3758ce9f 100644 --- a/ext/libsolvext.ver +++ b/ext/libsolvext.ver @@ -7,6 +7,7 @@ SOLV_1.0 { repo_add_code11_products; repo_add_content; repo_add_comps; + repo_add_cudf; repo_add_deb; repo_add_debdb; repo_add_debpackages; diff --git a/ext/repo_cudf.c b/ext/repo_cudf.c index 5a759906..d62ab382 100644 --- a/ext/repo_cudf.c +++ b/ext/repo_cudf.c @@ -281,7 +281,7 @@ repo_add_cudf(Repo *repo, Repo *installedrepo, FILE *fp, Queue *job, int flags) Id id, *idp; Offset off = makedeps(xrepo, p, 0, 0); for (idp = xrepo->idarraydata + off; (id = *idp) != 0; idp++) - queue_push2(job, SOLVER_UPDATE|SOLVER_SOLVABLE_PROVIDES, id); + queue_push2(job, SOLVER_INSTALL|SOLVER_ORUPDATE|SOLVER_SOLVABLE_PROVIDES, id); } continue; } diff --git a/tools/cudftest.c b/tools/cudftest.c index bf5bbca4..227ae0b3 100644 --- a/tools/cudftest.c +++ b/tools/cudftest.c @@ -68,7 +68,7 @@ main(int argc, char **argv) } if (argc < 2) { - fprintf(stderr, "Usage: cudftest [cudfout]"); + fprintf(stderr, "Usage: cudftest [cudfout]\n"); exit(1); } cudfin = argv[1];