diff options
| author | Daniel Kolesa <daniel@octaforge.org> | 2022-03-06 19:08:06 +0100 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2022-03-07 08:26:07 +0000 |
| commit | c5d9aaa1ee02c81de4319fcb0f4fb83310aab351 (patch) | |
| tree | 598da181ef4e4cf47e646528af9816213a55345d /src/apk_version.h | |
| parent | fa913aba4bbca9c672c581171c6845140010e80d (diff) | |
| download | apk-tools-c5d9aaa1ee02c81de4319fcb0f4fb83310aab351.tar.gz apk-tools-c5d9aaa1ee02c81de4319fcb0f4fb83310aab351.tar.bz2 apk-tools-c5d9aaa1ee02c81de4319fcb0f4fb83310aab351.tar.xz apk-tools-c5d9aaa1ee02c81de4319fcb0f4fb83310aab351.zip | |
adb: fix handling of conflicts
Ensure not to mask away previously set APK_VERSION_CONFLICT when
serializing.
When deserializing, make sure to actually write out the conflict
flag when no version part is set.
When creating apk_dependency, ensure to set the conflict bit
correctly and mask it off result_mask.
Fixes https://gitlab.alpinelinux.org/alpine/apk-tools/-/issues/10824
Diffstat (limited to 'src/apk_version.h')
| -rw-r--r-- | src/apk_version.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/apk_version.h b/src/apk_version.h index 0996207..59a7e57 100644 --- a/src/apk_version.h +++ b/src/apk_version.h @@ -17,6 +17,7 @@ #define APK_VERSION_LESS 2 #define APK_VERSION_GREATER 4 #define APK_VERSION_FUZZY 8 +#define APK_VERSION_CONFLICT 16 #define APK_DEPMASK_ANY (APK_VERSION_EQUAL|APK_VERSION_LESS|\ APK_VERSION_GREATER|APK_VERSION_FUZZY) |