diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2018-06-14 20:40:05 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2018-06-14 20:40:05 +0300 |
| commit | 7561a501b4336648cbed647d608320dad50b3dbc (patch) | |
| tree | 2030974aaa65d4cf0d031596cb32f774ca0b455e /src/fetch.c | |
| parent | 611172b7a92d1a9e635655cfdeec5b8c0be556e7 (diff) | |
| download | apk-tools-7561a501b4336648cbed647d608320dad50b3dbc.tar.gz apk-tools-7561a501b4336648cbed647d608320dad50b3dbc.tar.bz2 apk-tools-7561a501b4336648cbed647d608320dad50b3dbc.tar.xz apk-tools-7561a501b4336648cbed647d608320dad50b3dbc.zip | |
fetch: ignore conflicts when solving --recursive fetches
Diffstat (limited to 'src/fetch.c')
| -rw-r--r-- | src/fetch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fetch.c b/src/fetch.c index 9707752..e745d84 100644 --- a/src/fetch.c +++ b/src/fetch.c @@ -240,7 +240,7 @@ static void mark_names_recursive(struct apk_database *db, struct apk_string_arra struct apk_change *change; int r; - r = apk_solver_solve(db, 0, ctx->world, &changeset); + r = apk_solver_solve(db, APK_SOLVERF_IGNORE_CONFLICT, ctx->world, &changeset); if (r == 0) { foreach_array_item(change, changeset.changes) mark_package(ctx, change->new_pkg); |