summaryrefslogtreecommitdiffstats
path: root/libopkg
diff options
context:
space:
mode:
Diffstat (limited to 'libopkg')
-rw-r--r--libopkg/opkg_conf.c3
-rw-r--r--libopkg/pkg_vec.c10
2 files changed, 9 insertions, 4 deletions
diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
index f1ef0d0..bffeb84 100644
--- a/libopkg/opkg_conf.c
+++ b/libopkg/opkg_conf.c
@@ -359,7 +359,8 @@ opkg_conf_write_status_files(void)
/* We don't need most uninstalled packages in the status file */
if (pkg->state_status == SS_NOT_INSTALLED
&& (pkg->state_want == SW_UNKNOWN
- || pkg->state_want == SW_DEINSTALL
+ || (pkg->state_want == SW_DEINSTALL
+ && pkg->state_flag != SF_HOLD)
|| pkg->state_want == SW_PURGE)) {
continue;
}
diff --git a/libopkg/pkg_vec.c b/libopkg/pkg_vec.c
index 3cdc7fc..472962c 100644
--- a/libopkg/pkg_vec.c
+++ b/libopkg/pkg_vec.c
@@ -59,9 +59,13 @@ void pkg_vec_insert_merge(pkg_vec_t *vec, pkg_t *pkg, int set_status)
pkg->name, pkg->version, pkg->architecture,
vec->pkgs[i]->name, vec->pkgs[i]->version,
vec->pkgs[i]->architecture);
- if ((strcmp(pkg->name, vec->pkgs[i]->name) == 0)
- && (pkg_compare_versions(pkg, vec->pkgs[i]) == 0)
- && (strcmp(pkg->architecture, vec->pkgs[i]->architecture) == 0)) {
+ /* if the name,ver,arch matches, or the name matches and the
+ * package is marked deinstall/hold */
+ if ((!strcmp(pkg->name, vec->pkgs[i]->name))
+ && ((pkg->state_want == SW_DEINSTALL
+ && (pkg->state_flag & SF_HOLD))
+ || ((pkg_compare_versions(pkg, vec->pkgs[i]) == 0)
+ && (!strcmp(pkg->architecture, vec->pkgs[i]->architecture))))) {
found = 1;
opkg_msg(DEBUG2, "Duplicate for pkg=%s version=%s arch=%s.\n",
pkg->name, pkg->version, pkg->architecture);