summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich2019-01-18 17:41:16 +0000
committerJo-Philipp Wich2019-01-18 17:42:09 +0000
commit7708a01a084872bbe4c46f36d2da021fdeb10862 (patch)
tree01fd73813d850910ed1310963f1907e0e85e1312
parentfa137c25e1ba6efc3f9b435b964c0f77f52fbee2 (diff)
downloadopkg-lede-7708a01a084872bbe4c46f36d2da021fdeb10862.tar.gz
Revert "libopkg: accept alternative notation for "Replaces" control field"
This reverts commit 1504d35f123980bf322df99fb434f6fda6e3ecd2. We won't use Replaces: for the repo ABI_VERSION tracking after all, so drop this hack before it becomes another liability. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-rw-r--r--libopkg/pkg_parse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libopkg/pkg_parse.c b/libopkg/pkg_parse.c
index f6199da..0baa4db 100644
--- a/libopkg/pkg_parse.c
+++ b/libopkg/pkg_parse.c
@@ -302,7 +302,7 @@ int pkg_parse_line(void *ptr, char *line, uint mask)
case 'R':
if ((mask & PFM_RECOMMENDS) && is_field("Recommends", line))
parse_deplist(pkg, RECOMMEND, line + strlen("Recommends") + 1);
- else if ((mask & PFM_REPLACES) && (is_field("Replaces", line) || is_field("Replace2", line)))
+ else if ((mask & PFM_REPLACES) && is_field("Replaces", line))
parse_replacelist(pkg, line + strlen("Replaces") + 1);
break;