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/apk_package.h | |
| 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/apk_package.h')
| -rw-r--r-- | src/apk_package.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/apk_package.h b/src/apk_package.h index 070caa8..bd2bbe3 100644 --- a/src/apk_package.h +++ b/src/apk_package.h @@ -61,7 +61,7 @@ struct apk_dependency { struct apk_name *name; apk_blob_t *version; unsigned short repository_tag; - unsigned optional : 1; + unsigned conflict : 1; unsigned result_mask : 3; }; APK_ARRAY(apk_dependency_array, struct apk_dependency); |