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 <jo@mein.io>

diff --git a/libopkg/pkg.c b/libopkg/pkg.c
index 114cf05705666ab43c57903faafe6ba29e257eeb..5370cf94e506cf9bb715564a997181a7f7e2d63f 100644 (file)
--- 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;
 }