2003-04-30 James Henstridge <james@daa.com.au>

Author: jamesh
Date: 2003-05-01 01:14:30 GMT
2003-04-30  James Henstridge  <james@daa.com.au>

        * 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.

diff --git a/ChangeLog b/ChangeLog
index 0b237dad1a0f5a8af456aadabe08ac3b87e6b79c..9ba6276ba5a872622df88d3f36492e249d31a6d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-30  James Henstridge  <james@daa.com.au>
+
+       * 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  <james@daa.com.au>
 
        * pkg.c (add_virtual_pkgconfig_package): function to add a virtual

diff --git a/parse.c b/parse.c
index 51109257e682d24d2acf65885d80144a2e777f0d..136c6a2564fe0f042b7053c6b0e5339d30b4fa10 100644 (file)
--- 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 c1af2e105f65ba256719ad7da344fecd58cf4b97..632c4f6cb6fe9890d9d7f556c66d8b24a08e08ad 100644 (file)
--- 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);
     }