From 2dd2b1994446e152b1e3e79c9233f62edba14877 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Fri, 7 Apr 2017 09:17:28 -0500 Subject: [PATCH] parse: Don't emit unknown keyword warning for Libs.private Requires.private and Libs.private are skipped unless --static is in use. However, the parser was checking for Libs.private and this option in a single conditional unlike Requires.private. This was making the check fall through to the else and emit an "Unknown keyword" debug message when --static was not used. This was harmless but not true. https://bugs.freedesktop.org/show_bug.cgi?id=99770 --- parse.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/parse.c b/parse.c index 7bb666d..6e9907c 100644 --- a/parse.c +++ b/parse.c @@ -962,9 +962,11 @@ parse_line (Package *pkg, const char *untrimmed, const char *path, else goto cleanup; } - else if ((strcmp (tag, "Libs.private") == 0) && - ignore_private_libs == FALSE) - parse_libs_private (pkg, p, path); + else if (strcmp (tag, "Libs.private") == 0) + { + if (!ignore_private_libs) + parse_libs_private (pkg, p, path); + } else if (strcmp (tag, "Libs") == 0) parse_libs (pkg, p, path); else if (strcmp (tag, "Cflags") == 0 || -- 2.5.5