Changeset 236261 in webkit

Timestamp:

Sep 20, 2018, 9:12:30 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[WPE][GTK] webkit-flatpak intercepts --help for other commands
​https://bugs.webkit.org/show_bug.cgi?id=189058

The approach of run_in_sandbox_if_available is that we basically have the
same set of arguments to setup the sandbox (ie. port name, build type, etc...)
and we can pass those args first to setup the flatpak launcher object
and then to the underlying script. That doesn't work well with the --help argument
as once processed it 1. prints the help (which make no sense to the user of the calling script)

2. exits the app - The solution is to just make sure that --help is not used when using

flatpakutils from any script that is not webkit-flatpak itself.

Patch by Thibault Saunier <​tsaunier@igalia.com> on 2018-09-20
Reviewed by Michael Catanzaro.

• flatpak/flatpakutils.py:

(WebkitFlatpak.load_from_args):
(run_in_sandbox_if_available):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• flatpak/flatpakutils.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-09-20  Thibault Saunier  <tsaunier@igalia.com>
+
+        [WPE][GTK] webkit-flatpak intercepts --help for other commands
+        https://bugs.webkit.org/show_bug.cgi?id=189058
+
+        The approach of run_in_sandbox_if_available is that we basically have the
+        same set of arguments to setup the sandbox (ie. port name, build type, etc...)
+        and we can pass those args first to setup the flatpak launcher object
+        and then to the underlying script. That doesn't work well with the `--help` argument
+        as once processed it 1. prints the help (which make no sense to the user of the calling script)
+        2. exits the app - The solution is to just make sure that `--help` is not used when using
+        flatpakutils from any script that is not `webkit-flatpak` itself.
+
+        Reviewed by Michael Catanzaro.
+
+        * flatpak/flatpakutils.py:
+        (WebkitFlatpak.load_from_args):
+        (run_in_sandbox_if_available):
+
 2018-09-20  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 

trunk/Tools/flatpak/flatpakutils.py

@@ -464 +464 @@
 
     @staticmethod
-    def load_from_args(args=None):
+    def load_from_args(args=None, add_help=True):
         self = WebkitFlatpak()
 
-        parser = argparse.ArgumentParser(prog="webkit-flatpak")
+        parser = argparse.ArgumentParser(prog="webkit-flatpak", add_help=add_help)
         general = parser.add_argument_group("General")
         general.add_argument('--verbose', action='store_true',
@@ -857 +857 @@
         return None
 
-    flatpak_runner = WebkitFlatpak.load_from_args(args)
+    flatpak_runner = WebkitFlatpak.load_from_args(args, add_help=False)
     if not flatpak_runner.clean_args():
         return None