From 7b9568a62457eb2dd828efd7fc809e41541ae60b Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Tue, 1 Jun 2021 12:35:24 +0100 Subject: [PATCH] mtree: Accept content= as a synonym for contents= libarchive allows both, although FreeBSD and NetBSD mtree do not. Signed-off-by: Simon McVittie <smcv@collabora.com> --- pressure-vessel/mtree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pressure-vessel/mtree.c b/pressure-vessel/mtree.c index 2a9a47a10..ff7e8e2e8 100644 --- a/pressure-vessel/mtree.c +++ b/pressure-vessel/mtree.c @@ -153,7 +153,8 @@ pv_mtree_entry_parse (const char *line, continue; } - if (g_str_has_prefix (tokens[i], "contents=")) + if (g_str_has_prefix (tokens[i], "contents=") + || g_str_has_prefix (tokens[i], "content=")) { entry->contents = g_strcompress (equals + 1); continue; -- GitLab