X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fpkg_hash.c;h=d15d441f54df793599179254b3d9e6f23152d369;hp=0106e6550740493ddbf1391feb62de6c6491d042;hb=a1fc2ffe4491e0df37bb173e0d452c3b2b3ec498;hpb=4b0b7ca249bfa4ecc099c2ca56527eb91776f198 diff --git a/libopkg/pkg_hash.c b/libopkg/pkg_hash.c index 0106e65..d15d441 100644 --- a/libopkg/pkg_hash.c +++ b/libopkg/pkg_hash.c @@ -1,4 +1,4 @@ -/* opkg_hash.c - the itsy package management system +/* opkg_hash.c - the opkg package management system Steven M. Ayer @@ -15,7 +15,7 @@ General Public License for more details. */ -#include "opkg.h" +#include "includes.h" #include #include #include @@ -47,14 +47,41 @@ static abstract_pkg_t * add_new_abstract_pkg_by_name(hash_table_t * hash, const */ - int pkg_hash_init(const char *name, hash_table_t *hash, int len) { return hash_table_init(name, hash, len); } +void free_pkgs (const char *key, void *entry, void *data) +{ + int i; + abstract_pkg_t *ab_pkg; + + /* each entry in the hash table is an abstract package, which contains a list + * of packages that provide the abstract package */ + + ab_pkg = (abstract_pkg_t*) entry; + + if (ab_pkg->pkgs) + { + for (i = 0; i < ab_pkg->pkgs->len; i++) + { + pkg_deinit (ab_pkg->pkgs->pkgs[i]); + free (ab_pkg->pkgs->pkgs[i]); + } + } + + abstract_pkg_vec_free (ab_pkg->provided_by); + abstract_pkg_vec_free (ab_pkg->replaced_by); + pkg_vec_free (ab_pkg->pkgs); + free (ab_pkg->depended_upon_by); + free (ab_pkg->name); + free (ab_pkg); +} + void pkg_hash_deinit(hash_table_t *hash) { + hash_table_foreach (hash, free_pkgs, NULL); hash_table_deinit(hash); } @@ -66,10 +93,8 @@ static char *pkg_get_default_arch(opkg_conf_t *conf) char *def_arch = HOST_CPU_STR; /* Default arch */ int def_prio = 0; /* Other archs override this */ - l = conf->arch_list.head; - - while (l) { - nv_pair_t *nv = l->data; + list_for_each_entry(l , &conf->arch_list.head, node) { + nv_pair_t *nv = (nv_pair_t *)l->data; int priority = strtol(nv->value, NULL, 0); /* Check if this arch has higher priority, and is valid */ @@ -79,7 +104,6 @@ static char *pkg_get_default_arch(opkg_conf_t *conf) def_prio = priority; def_arch = nv->name; } - l = l->next; } return strdup(def_arch); @@ -112,6 +136,7 @@ int pkg_hash_add_from_file(opkg_conf_t *conf, const char *file_name, } hash_insert_pkg(hash, pkg, is_status_file,conf); } else { + pkg_deinit (pkg); free(pkg); } } @@ -141,7 +166,7 @@ abstract_pkg_vec_t *pkg_hash_fetch_all_installation_candidates(hash_table_t *has pkg_t *pkg_hash_fetch_best_installation_candidate(opkg_conf_t *conf, abstract_pkg_t *apkg, - int (*constraint_fcn)(pkg_t *pkg, void *cdata), void *cdata, int quiet) + int (*constraint_fcn)(pkg_t *pkg, void *cdata), void *cdata, int quiet, int *err) { int i; int nprovides = 0; @@ -153,9 +178,13 @@ pkg_t *pkg_hash_fetch_best_installation_candidate(opkg_conf_t *conf, abstract_pk abstract_pkg_vec_t *providers = abstract_pkg_vec_alloc(); pkg_t *latest_installed_parent = NULL; pkg_t *latest_matching = NULL; + pkg_t *priorized_matching = NULL; pkg_t *held_pkg = NULL; pkg_t *good_pkg_by_name = NULL; + if (err) + *err = 0; + if (matching_apkgs == NULL || providers == NULL || apkg == NULL || apkg->provided_by == NULL || (apkg->provided_by->len == 0)) return NULL; @@ -216,12 +245,21 @@ pkg_t *pkg_hash_fetch_best_installation_candidate(opkg_conf_t *conf, abstract_pk pkg_t *maybe = vec->pkgs[i]; opkg_message(conf, OPKG_DEBUG, " %s arch=%s arch_priority=%d version=%s \n", maybe->name, maybe->architecture, maybe->arch_priority, maybe->version); - if (maybe->arch_priority > 0) { + /* We make sure not to add the same package twice. Need to search for the reason why + they show up twice sometimes. */ + if ((maybe->arch_priority > 0) && (! pkg_vec_contains(matching_pkgs, maybe))) { max_count++; abstract_pkg_vec_insert(matching_apkgs, maybe->parent); pkg_vec_insert(matching_pkgs, maybe); } } + + if (vec->len > 0 && matching_pkgs->len < 1) + { + opkg_message (conf, OPKG_ERROR, "Packages were found, but none compatible with the architectures configured\n"); + if (err) + *err = OPKG_PKG_HAS_NO_AVAILABLE_ARCH; + } } } @@ -258,21 +296,24 @@ pkg_t *pkg_hash_fetch_best_installation_candidate(opkg_conf_t *conf, abstract_pk latest_installed_parent = matching; if (matching->state_flag & (SF_HOLD|SF_PREFER)) { if (held_pkg) - opkg_message(conf, OPKG_ERROR, "Multiple packages (%s and %s) providing same name marked HOLD or PREFER. Using latest.\n", + opkg_message(conf, OPKG_NOTICE, "Multiple packages (%s and %s) providing same name marked HOLD or PREFER. Using latest.\n", held_pkg->name, matching->name); held_pkg = matching; } } if (!good_pkg_by_name && !held_pkg && !latest_installed_parent && matching_apkgs->len > 1 && !quiet) { - opkg_message(conf, OPKG_ERROR, "Package=%s, %d matching providers\n", - apkg->name, matching_apkgs->len); - for (i = 0; i < matching_apkgs->len; i++) { - abstract_pkg_t *matching = matching_apkgs->pkgs[i]; - opkg_message(conf, OPKG_ERROR, " %s\n", matching->name); - } - opkg_message(conf, OPKG_ERROR, "Please select one with opkg install or opkg flag prefer\n"); - } + int prio = 0; + for (i = 0; i < matching_pkgs->len; i++) { + pkg_t *matching = matching_pkgs->pkgs[i]; + if (matching->arch_priority > prio) { + priorized_matching = matching; + prio = matching->arch_priority; + opkg_message(conf, OPKG_DEBUG, "Match with priority %i %s\n", prio, matching->name); + } + } + + } if (matching_apkgs->len > 1 && conf->verbosity > 1) { opkg_message(conf, OPKG_NOTICE, "%s: for apkg=%s, %d matching pkgs\n", @@ -301,6 +342,11 @@ pkg_t *pkg_hash_fetch_best_installation_candidate(opkg_conf_t *conf, abstract_pk opkg_message(conf, OPKG_INFO, " using latest version of installed package %s\n", latest_installed_parent->name); return latest_installed_parent; } + if (priorized_matching) { + opkg_message(conf, OPKG_INFO, " using priorized matching %s %s %s\n", + priorized_matching->name, priorized_matching->version, priorized_matching->architecture); + return priorized_matching; + } if (nmatching > 1) { opkg_message(conf, OPKG_INFO, " no matching pkg out of matching_apkgs=%d\n", nmatching); return NULL; @@ -322,15 +368,18 @@ static int pkg_name_constraint_fcn(pkg_t *pkg, void *cdata) return 0; } -pkg_t *pkg_hash_fetch_best_installation_candidate_by_name(opkg_conf_t *conf, const char *name) +pkg_t *pkg_hash_fetch_best_installation_candidate_by_name(opkg_conf_t *conf, const char *name, int *err) { hash_table_t *hash = &conf->pkg_hash; abstract_pkg_t *apkg = NULL; + pkg_t *ret; if (!(apkg = abstract_pkg_fetch_by_name(hash, name))) return NULL; - - return pkg_hash_fetch_best_installation_candidate(conf, apkg, pkg_name_constraint_fcn, apkg->name, 0); + + ret = pkg_hash_fetch_best_installation_candidate(conf, apkg, pkg_name_constraint_fcn, apkg->name, 0, err); + + return ret; } @@ -418,17 +467,6 @@ pkg_vec_t *pkg_vec_fetch_by_name(hash_table_t *hash, const char *pkg_name) } } -static int pkg_compare_names(const void *p1, const void *p2) -{ - const pkg_t *pkg1 = *(const pkg_t **)p1; - const pkg_t *pkg2 = *(const pkg_t **)p2; - if (pkg1->name == NULL) - return 1; - if (pkg2->name == NULL) - return -1; - return(strcmp(pkg1->name, pkg2->name)); -} - static void pkg_hash_fetch_available_helper(const char *pkg_name, void *entry, void *data) { @@ -447,7 +485,6 @@ static void pkg_hash_fetch_available_helper(const char *pkg_name, void *entry, v void pkg_hash_fetch_available(hash_table_t *hash, pkg_vec_t *all) { hash_table_foreach(hash, pkg_hash_fetch_available_helper, all); - qsort(all->pkgs, all->len, sizeof(pkg_t *), pkg_compare_names); } static void pkg_hash_fetch_all_installed_helper(const char *pkg_name, void *entry, void *data) @@ -468,7 +505,6 @@ static void pkg_hash_fetch_all_installed_helper(const char *pkg_name, void *entr void pkg_hash_fetch_all_installed(hash_table_t *hash, pkg_vec_t *all) { hash_table_foreach(hash, pkg_hash_fetch_all_installed_helper, all); - qsort(all->pkgs, all->len, sizeof(void*), pkg_compare_names); } static void pkg_hash_dump_helper(const char *pkg_name, void *entry, void *data) @@ -488,7 +524,7 @@ static void pkg_hash_dump_helper(const char *pkg_name, void *entry, void *data) if (dependents != NULL) while (dependents [i] != NULL && i < ab_pkg->provided_by->len) printf ("\tprovided by - %s\n", dependents [i ++]->name); - pkg = pkg_hash_fetch_best_installation_candidate_by_name (conf, ab_pkg->name); + pkg = pkg_hash_fetch_best_installation_candidate_by_name (conf, ab_pkg->name, NULL); if (pkg) { i = 0; while (i < pkg->depends_count) @@ -606,10 +642,13 @@ int file_hash_set_file_owner(opkg_conf_t *conf, const char *file_name, pkg_t *ow // opkg_message(conf, OPKG_DEBUG2, "owning_pkg=%s filename=%s\n", owning_pkg->name, file_name); hash_table_insert(file_hash, file_name, owning_pkg); if (old_owning_pkg) { + pkg_get_installed_files(old_owning_pkg); str_list_remove_elt(old_owning_pkg->installed_files, file_name); + pkg_free_installed_files(old_owning_pkg); /* mark this package to have its filelist written */ old_owning_pkg->state_flag |= SF_FILELIST_CHANGED; owning_pkg->state_flag |= SF_FILELIST_CHANGED; + } return 0; }