~vcs-imports/network-manager-applet/git-master

Viewing all changes in revision 3849.

  • Committer: Lubomir Rintel
  • Author(s): Adam Williamson
  • Date: 2018-06-06 21:35:02 UTC
  • Revision ID: git-v1:88e4dcab27e614e948a78e2235495a78fc0f1993
editor: handle --keep-above passed through to editor_command_line

Handling of nm-connection-editor command line arguments was changed in
f3782da2. Since that commit, most args are handled by `editor_command_line`,
but one (`--keep-above`) is handled by `main`. Unfortunately, if
`--keep-above` appears with other arguments, `main` does not strip it from
argv and parsing in `editor_command_line` fails with "Failed to parse
options".

To handle this, let's just have `editor_command_line` recognize but ignore
`--keep-above` if it encounters it.

https://gitlab.gnome.org/GNOME/network-manager-applet/issues/1

Signed-off-by: Adam Williamson <awilliam@redhat.com>

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: