projects
/
oweals
/
opkg-lede.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
pkg: forward "provided_by_hand" flag in pkg_merge()
[oweals/opkg-lede.git]
/
libopkg
/
pkg.c
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;
}