diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2012-02-29 08:53:43 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2012-02-29 08:53:43 +0200 |
| commit | f27f194d92c952da337205c0176f68a13f0cba7c (patch) | |
| tree | ac6d7d92c024589003b7e30493ad0d3ff0662c0d /src/upgrade.c | |
| parent | 2e8fe783a11bcd6ccc7f1a08d8b38eb76d87dc35 (diff) | |
| download | apk-tools-f27f194d92c952da337205c0176f68a13f0cba7c.tar.gz apk-tools-f27f194d92c952da337205c0176f68a13f0cba7c.tar.bz2 apk-tools-f27f194d92c952da337205c0176f68a13f0cba7c.tar.xz apk-tools-f27f194d92c952da337205c0176f68a13f0cba7c.zip | |
solver, test: make conflicts unconditional
Solver will now never report partial solution where a conflict
constraint is not satisfied. The is because with --force we might
install the partial solution; and if conflicted packages were to
be installed we might have extra trouble.
Diffstat (limited to 'src/upgrade.c')
| -rw-r--r-- | src/upgrade.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/upgrade.c b/src/upgrade.c index 1185079..914f019 100644 --- a/src/upgrade.c +++ b/src/upgrade.c @@ -114,7 +114,7 @@ static int upgrade_main(void *ctx, struct apk_database *db, int argc, char **arg for (i = 0; i < world->num; i++) { struct apk_dependency *dep = &world->item[i]; if (dep->result_mask == APK_DEPMASK_CHECKSUM) { - dep->result_mask = APK_DEPMASK_REQUIRE; + dep->result_mask = APK_DEPMASK_ANY; dep->version = apk_blob_atomize(APK_BLOB_NULL); } } |