From 69689ee4c3fd92bef21b4d28fd79f446925f82a8 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 16 Feb 2017 11:47:48 +0100 Subject: [PATCH] libopkg: fix merging PKG_CONFFILES in pkg_merge() Signed-off-by: Jo-Philipp Wich --- libopkg/pkg.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libopkg/pkg.c b/libopkg/pkg.c index 1a3eda8..0489c1c 100644 --- a/libopkg/pkg.c +++ b/libopkg/pkg.c @@ -376,7 +376,6 @@ err0: int pkg_merge(pkg_t * oldpkg, pkg_t * newpkg) { abstract_pkg_t **ab; - conffile_list_t *cf, head; if (oldpkg == newpkg) { return 0; @@ -440,12 +439,8 @@ int pkg_merge(pkg_t * oldpkg, pkg_t * newpkg) pkg_set_string(oldpkg, PKG_SOURCE, pkg_get_string(newpkg, PKG_SOURCE)); if (!pkg_get_ptr(oldpkg, PKG_CONFFILES)) { - cf = pkg_get_ptr(newpkg, PKG_CONFFILES); - if (cf) { - conffile_list_init(&head); - list_splice_init(&cf->head, &head.head); - pkg_set_raw(oldpkg, PKG_CONFFILES, &head, sizeof(head)); - } + pkg_set_ptr(oldpkg, PKG_CONFFILES, pkg_get_ptr(newpkg, PKG_CONFFILES)); + pkg_set_ptr(newpkg, PKG_CONFFILES, NULL); } if (!oldpkg->installed_files) { -- 2.25.1