summaryrefslogtreecommitdiff
path: root/src/add.c
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2011-09-16 17:10:50 +0300
committerTimo Teräs <timo.teras@iki.fi>2011-09-16 17:10:50 +0300
commit51999c97dabf9fbbe352ca3ead02851a982fcade (patch)
treeec1033d2d1079b24691246c23137e65d517c5b9b /src/add.c
parentbcd0d45a49c89fd809f0a028012196f5a9527c99 (diff)
downloadapk-tools-51999c97dabf9fbbe352ca3ead02851a982fcade.tar.gz
apk-tools-51999c97dabf9fbbe352ca3ead02851a982fcade.tar.bz2
apk-tools-51999c97dabf9fbbe352ca3ead02851a982fcade.tar.xz
apk-tools-51999c97dabf9fbbe352ca3ead02851a982fcade.zip
solver: inheritable solver flags
allow per-name solver flags to be inheritable, and use them in self-upgrade, add -u and the fix applet. this gives more familiar behaviour for the upgrades.
Diffstat (limited to 'src/add.c')
-rw-r--r--src/add.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/add.c b/src/add.c
index 5c2db58..5e1b2bb 100644
--- a/src/add.c
+++ b/src/add.c
@@ -114,14 +114,18 @@ static int add_main(void *ctx, struct apk_database *db, int argc, char **argv)
if (virtpkg == NULL) {
apk_deps_add(&world, &dep);
- apk_solver_set_name_flags(dep.name, actx->solver_flags);
+ apk_solver_set_name_flags(dep.name,
+ actx->solver_flags,
+ actx->solver_flags);
} else {
apk_deps_add(&virtpkg->depends, &dep);
}
}
if (virtpkg) {
apk_deps_add(&world, &virtdep);
- apk_solver_set_name_flags(virtdep.name, actx->solver_flags);
+ apk_solver_set_name_flags(virtdep.name,
+ actx->solver_flags,
+ actx->solver_flags);
}
r = apk_solver_commit(db, 0, world);