Attachment 130747 Details for Bug 99770 – parse: Don't emit unknown keyword warning for Libs.private

[patch] parse: Don't emit unknown keyword warning for Libs.private

parse-Dont-emit-unknown-keyword-warning-for-Libspr.patch (text/plain), 1.33 KB, created by Dan Nicholson on 2017-04-07 14:23:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Nicholson

Created: 2017-04-07 14:23:49 UTC

Size: 1.33 KB

patch

obsolete

>From 2dd2b1994446e152b1e3e79c9233f62edba14877 Mon Sep 17 00:00:00 2001
>From: Dan Nicholson <dbn.lists@gmail.com>
>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

Actions: View | Splinter Review

Attachments on bug 99770: 130747

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.