From c6d9962d818abd557cf25a686ea96fcf1315bc8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Tue, 13 Sep 2011 11:47:34 +0300 Subject: solver: add per-name specific flags, and fix the fix applet --- src/add.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/add.c') diff --git a/src/add.c b/src/add.c index a572c74e2b..057d6cf819 100644 --- a/src/add.c +++ b/src/add.c @@ -112,15 +112,19 @@ static int add_main(void *ctx, struct apk_database *db, int argc, char **argv) return -1; } - if (virtpkg) - apk_deps_add(&virtpkg->depends, &dep); - else + if (virtpkg == NULL) { apk_deps_add(&world, &dep); + apk_solver_set_name_flags(dep.name, actx->solver_flags); + } else { + apk_deps_add(&virtpkg->depends, &dep); + } } - if (virtpkg) + if (virtpkg) { apk_deps_add(&world, &virtdep); + apk_solver_set_name_flags(virtdep.name, actx->solver_flags); + } - r = apk_solver_commit(db, actx->solver_flags, world); + r = apk_solver_commit(db, 0, world); apk_dependency_array_free(&world); return r; -- cgit v1.2.3