libopkg: fix merging PKG_CONFFILES in pkg_merge()

[oweals/opkg-lede.git] / libopkg / opkg.c

diff --git a/libopkg/opkg.c b/libopkg/opkg.c
index 61c73065c5457f53d37cbe4865263e573908c3bc..d8c17cdf87bd099adaa1e10c5cd528d14059de12 100644 (file)
--- a/libopkg/opkg.c
+++ b/libopkg/opkg.c
@@ -707,7 +707,7 @@ opkg_list_upgradable_packages(opkg_package_callback_t callback, void *user_data)
        head = prepare_upgrade_list();
        for (node = active_list_next(head, head); node;
             node = active_list_next(head, node)) {
-               old = list_entry(node, pkg_t, list);
+               old = node->pkg;
                new =
                    pkg_hash_fetch_best_installation_candidate_by_name(old->
                                                                       name);
@@ -749,7 +749,7 @@ pkg_t *opkg_find_package(const char *name, const char *ver, const char *arch,
 
                /* check architecture */
                if (arch) {
-                       if (sstrcmp(pkg_get_string(pkg, PKG_ARCHITECTURE), arch))
+                       if (sstrcmp(pkg_get_architecture(pkg), arch))
                                continue;
                }