From c5d9aaa1ee02c81de4319fcb0f4fb83310aab351 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Sun, 6 Mar 2022 19:08:06 +0100 Subject: 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 --- src/apk_version.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/apk_version.h') 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) -- cgit v1.2.3-70-g09d2