Re: [PATCH] Report which option is unknown



On Fri, 2014-02-14 at 22:59 +0100, Guido G??nther wrote:
So far NetworkManager didn't tell which option it didn't know about:

  Invalid option.  Please use --help to see a list of valid options.

Now it is a bit more informative:

  Unknown option --asdf.  Please use --help to see a list of valid options.

The "Unknown option" string is marked as translatable in glib so i18n
doesn't suffer.
---
 src/main.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main.c b/src/main.c
index 1ea2274..4422240 100644
--- a/src/main.c
+++ b/src/main.c
@@ -391,11 +391,13 @@ main (int argc, char *argv[])
      g_option_context_set_summary (opt_ctx,
              _("NetworkManager monitors all network connections and automatically\nchooses the best 
connection to use.  It also allows the user to\nspecify wireless access points which wireless cards in the 
computer\nshould associate with."));
 
-     success = g_option_context_parse (opt_ctx, &argc, &argv, NULL);
+     success = g_option_context_parse (opt_ctx, &argc, &argv, &error);
      g_option_context_free (opt_ctx);
 
      if (!success) {
-             fprintf (stderr, _("Invalid option.  Please use --help to see a list of valid options.\n"));
+             fprintf (stderr, _("%s.  Please use --help to see a list of valid options.\n"),
+                      error->message);
+             g_clear_error (&error);
              exit (1);
      }
 


Hi Guenter,

patch applied as
http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=0e8901fbd162240c4ef533724c2b97f76ee3f1a7


Thank you!!
Thomas

Attachment: signature.asc
Description: This is a digitally signed message part



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]