From 15f255915ce893750165c89af9d1ebbbc571a8dc Mon Sep 17 00:00:00 2001 From: pixdamix@gmail.com Date: Thu, 22 Nov 2012 04:18:13 -0500 Subject: Add the --prefer-arch-to-version option If there were more than one candidate which had the same pkg name in the candidate list, for example, the same pkg with different versions, then it would use the last one which was the highest version one in the past, but it will use the higher arch priority when this option is specified. Signed-off-by: Robert Yang git-svn-id: http://opkg.googlecode.com/svn/trunk@643 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358 --- (limited to 'libopkg') diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h index 3a60bc5..75b4cd6 100644 --- a/libopkg/opkg_conf.h +++ b/libopkg/opkg_conf.h @@ -77,6 +77,7 @@ struct opkg_conf int force_removal_of_essential_packages; int force_postinstall; int force_remove; + int prefer_arch_to_version; int check_signature; int nodeps; /* do not follow dependencies */ char *offline_root; diff --git a/libopkg/pkg_hash.c b/libopkg/pkg_hash.c index a99cf6b..4bc0c3a 100644 --- a/libopkg/pkg_hash.c +++ b/libopkg/pkg_hash.c @@ -376,10 +376,22 @@ pkg_hash_fetch_best_installation_candidate(abstract_pkg_t *apkg, if (constraint_fcn(matching, cdata)) { opkg_msg(DEBUG, "Candidate: %s %s.\n", matching->name, matching->version) ; - good_pkg_by_name = matching; /* It has been provided by hand, so it is what user want */ - if (matching->provided_by_hand == 1) - break; + if (matching->provided_by_hand == 1) { + good_pkg_by_name = matching; + break; + } + /* Respect to the arch priorities when given alternatives */ + if (good_pkg_by_name && conf->prefer_arch_to_version) { + if (matching->arch_priority >= good_pkg_by_name->arch_priority) { + good_pkg_by_name = matching; + opkg_msg(DEBUG, "%s %s wins by priority.\n", + matching->name, matching->version) ; + } else + opkg_msg(DEBUG, "%s %s wins by priority.\n", + good_pkg_by_name->name, good_pkg_by_name->version) ; + } else + good_pkg_by_name = matching; } } -- cgit v0.9.1