disable printing of all infos when USE_GOPTION is set and

a command line option for a specific info was set

(in other words: make the behaviour of goption and getopt the same)

svn path=/trunk/; revision=48841

1 files changed, 5 insertions, 1 deletions

diff --git a/capinfos.c b/capinfos.c
index 0cdb981056..5bca75c46b 100644
--- a/capinfos.c
+++ b/capinfos.c
@@ -1189,7 +1189,11 @@ main(int argc, char *argv[])
      ran.
    */
   argv[0] = (char *)"capinfos";
-  ;
+
+  /* if we have at least one cmdline option, we disable printing all infos */
+  if (argc>=2 && report_all_infos)
+    disable_all_infos();
+
   if( !g_option_context_parse(ctx, &argc, &argv, &parse_err) ) {
     if(parse_err) g_print ("option parsing failed: %s\n", parse_err->message);
     g_print("%s", g_option_context_get_help (ctx, TRUE, NULL));