WebKit Bugzilla
Attachment 350204 Details for
Bug 189058
: [WPE][GTK] webkit-flatpak intercepts --help for other commands
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for landing
bug-189058-20180920123457.patch (text/plain), 2.40 KB, created by
Thibault Saunier
on 2018-09-20 08:34:58 PDT
(
hide
)
Description:
Patch for landing
Filename:
MIME Type:
Creator:
Thibault Saunier
Created:
2018-09-20 08:34:58 PDT
Size:
2.40 KB
patch
obsolete
>Subversion Revision: 236258 >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 8f31b75a63d59b245af29543580c5516a602b7a4..304a915fdf6da60214bff2fed123875673f81aa8 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,22 @@ >+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> > > Unreviewed. Add W3C imported tests to the MSEEME watchlist. >diff --git a/Tools/flatpak/flatpakutils.py b/Tools/flatpak/flatpakutils.py >index 5043110c3e300a6789bc14c053bdcf1b37bf27aa..a523e5c2617c673eab32997bedf02b160d29902d 100644 >--- a/Tools/flatpak/flatpakutils.py >+++ b/Tools/flatpak/flatpakutils.py >@@ -463,10 +463,10 @@ def disable_signals(signals=[signal.SIGINT]): > class WebkitFlatpak: > > @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', > help='Show debug message') >@@ -856,7 +856,7 @@ def run_in_sandbox_if_available(args): > if not check_flatpak(verbose=False): > 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 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 189058
:
350189
| 350204