From 41fb3a4f9e5949a66fedc069f94b75c18614728d Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Wed, 15 Feb 2012 13:57:36 +0200 Subject: solver, db: repository pinning improvements * solver internally calculates now using tags; not repository masks * installeddb now contains the tag name where the package came from -> we can now handle upgrades properly * the pinning is still a preference, and not strictly enforced; versioned dependencies may overrule preference --- src/apk_solver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/apk_solver.h') diff --git a/src/apk_solver.h b/src/apk_solver.h index 235ac0c..7dd2914 100644 --- a/src/apk_solver.h +++ b/src/apk_solver.h @@ -15,6 +15,7 @@ struct apk_change { struct apk_package *oldpkg; struct apk_package *newpkg; + unsigned short repository_tag; }; APK_ARRAY(apk_change_array, struct apk_change); @@ -25,7 +26,6 @@ struct apk_changeset { #define APK_SOLVERF_UPGRADE 0x0001 #define APK_SOLVERF_AVAILABLE 0x0002 #define APK_SOLVERF_REINSTALL 0x0004 -#define APK_SOLVERF_PREFER_TAG 0x0008 void apk_solver_set_name_flags(struct apk_name *name, unsigned short solver_flags, -- cgit v1.2.3-60-g2f50