Add --short-errors

2005-10-16  Tollef Fog Heen  <tfheen@err.no>

	* pkg.c (get_package_quiet): Add get_package_quiet which is just
	the same as get_package except it sets warn to false.

	* pkg.h: Add prototype for get_package_quiet.

	* main.c (main): Add --short-errors flag to suppress most of the
	output when a module is not found.

diff --git a/ChangeLog b/ChangeLog
index f0b42fddc0f0e5ba93a0591dc40db4f8d11dcd99..ed12518a9d48e4004761517525ee65f02c8de38f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-10-16  Tollef Fog Heen  <tfheen@err.no>
+
+       * pkg.c (get_package_quiet): Add get_package_quiet which is just
+       the same as get_package except it sets warn to false.
+
+       * pkg.h: Add prototype for get_package_quiet.
+
+       * main.c (main): Add --short-errors flag to suppress most of the
+       output when a module is not found.
+
 2005-10-01  Tollef Fog Heen  <tfheen@err.no>
 
        * pkg.c (packages_get_var): Don't try to chop if string length is

diff --git a/main.c b/main.c
index 199fd0c790cb3b667a77f8e05c1e64fb0599d77e..2d31d15f744b87a9c41fe2e7c544602752a37ed6 100644 (file)
--- a/main.c
+++ b/main.c
@@ -183,6 +183,7 @@ main (int argc, char **argv)
   int want_other_cflags = 0;
   int want_list = 0;
   int want_static_lib_list = ENABLE_INDIRECT_DEPS;
+  int want_short_errors = 0;
   int result;
   int want_uninstalled = 0;
   char *variable_name = NULL;
@@ -218,6 +219,8 @@ main (int argc, char **argv)
       "output all linker flags" },
     { "static", 0, POPT_ARG_NONE, &want_static_lib_list, 0,
       "output linker flags for static linking" },
+    { "short-errors", 0, POPT_ARG_NONE, &want_short_errors, 0,
+      "print short errors" },
     { "libs-only-l", 0, POPT_ARG_NONE, &want_l_libs, 0,
       "output -l flags" },
     { "libs-only-other", 0, POPT_ARG_NONE, &want_other_libs, 0,
@@ -469,7 +472,10 @@ main (int argc, char **argv)
         Package *req;
         RequiredVersion *ver = iter->data;
 
-        req = get_package (ver->name);
+        if (want_short_errors)
+          req = get_package_quiet (ver->name);
+        else
+          req = get_package (ver->name);
 
         if (req == NULL)
           {

diff --git a/pkg.c b/pkg.c
index 84f710e41e723fed83505de35694b615a9083630..e200a52b6edc82bbc05bc0800942261cd91e2f81 100644 (file)
--- a/pkg.c
+++ b/pkg.c
@@ -387,6 +387,12 @@ get_package (const char *name)
   return internal_get_package (name, TRUE, TRUE);
 }
 
+Package *
+get_package_quiet (const char *name)
+{
+  return internal_get_package (name, FALSE, TRUE);
+}
+
 static GSList*
 string_list_strip_duplicates (GSList *list)
 {

diff --git a/pkg.h b/pkg.h
index 67e9a84e971184131c6559748630406dbe9e4d4e..80432058ad6cb29fb3ad0e17d40b95676940bf4c 100644 (file)
--- a/pkg.h
+++ b/pkg.h
@@ -78,6 +78,7 @@ struct _Package
 };
 
 Package *get_package               (const char *name);
+Package *get_package_quiet         (const char *name);
 char *   package_get_l_libs        (Package    *pkg);
 char *   packages_get_l_libs       (GSList     *pkgs);
 char *   package_get_L_libs        (Package    *pkg);