From 7d74866d21edb0ce8f8d12c438d5a051c37f3d07 Mon Sep 17 00:00:00 2001 From: Arch Librarian Date: Thu, 14 Jul 2005 13:05:55 +0000 Subject: [PATCH] 2003-04-30 James Henstridge Author: jamesh Date: 2003-05-01 01:14:30 GMT 2003-04-30 James Henstridge * pkg.c (verify_package): fix up error messages. * parse.c (parse_line): don't error out on unknown keywords, as they may represent future extensions to the file format. --- ChangeLog | 7 +++++++ parse.c | 11 +++++++---- pkg.c | 4 ++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b237da..9ba6276 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-04-30 James Henstridge + + * pkg.c (verify_package): fix up error messages. + + * parse.c (parse_line): don't error out on unknown keywords, as + they may represent future extensions to the file format. + 2003-02-22 James Henstridge * pkg.c (add_virtual_pkgconfig_package): function to add a virtual diff --git a/parse.c b/parse.c index 5110925..136c6a2 100644 --- a/parse.c +++ b/parse.c @@ -836,10 +836,13 @@ parse_line (Package *pkg, const char *untrimmed, const char *path) parse_url (pkg, p, path); else { - verbose_error ("Unknown keyword '%s' in '%s'\n", - tag, path); - - exit (1); + /* we don't error out on unknown keywords because they may + * represent additions to the .pc file format from future + * versions of pkg-config. We do make a note of them in the + * debug spew though, in order to help catch mistakes in .pc + * files. */ + debug_spew ("Unknown keyword '%s' in '%s'\n", + tag, path); } } else if (*p == '=') diff --git a/pkg.c b/pkg.c index c1af2e1..632c4f6 100644 --- a/pkg.c +++ b/pkg.c @@ -716,14 +716,14 @@ verify_package (Package *pkg) if (pkg->version == NULL) { verbose_error ("Package '%s' has no Version: field\n", - pkg->name); + pkg->key); exit (1); } if (pkg->description == NULL) { verbose_error ("Package '%s' has no Description: field\n", - pkg->description); + pkg->key); exit (1); } -- 2.39.5