From 758527e6e714fa077445a6f9f12b5e0a295d2af8 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 1 Mar 2017 00:08:40 +0100 Subject: [PATCH] pkg: forward "provided_by_hand" flag in pkg_merge() Due to the fact that we now load status files after preparing the abstract structures describing the cli specified packages, we need to ensure that the "provided_by_hand" flag is properly conveyed in pkg_merge(), otherwise the cli provided package archive might get ignored in favor to a newer version from feeds. Signed-off-by: Jo-Philipp Wich --- libopkg/pkg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libopkg/pkg.c b/libopkg/pkg.c index 114cf05..5370cf9 100644 --- a/libopkg/pkg.c +++ b/libopkg/pkg.c @@ -481,6 +481,9 @@ int pkg_merge(pkg_t * oldpkg, pkg_t * newpkg) if (!oldpkg->essential) oldpkg->essential = newpkg->essential; + if (!oldpkg->provided_by_hand) + oldpkg->provided_by_hand = newpkg->provided_by_hand; + return 0; } -- 2.25.1