From: Jo-Philipp Wich Date: Tue, 28 Feb 2017 23:08:40 +0000 (+0100) Subject: pkg: forward "provided_by_hand" flag in pkg_merge() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=758527e6e714fa077445a6f9f12b5e0a295d2af8;p=project%2Fopkg-lede.git 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 --- 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; }