314a048f68
Bundling mozjs in gjs should make it possible to remove the system wide mozjs115 package from base RHEL 10, which makes it easier in the future if we need to update gjs to use newer mozjs. At that point, we can just update gjs to the new mozjs version it needs and not have to worry about maintaining a system-wide mozjs115 for all of RHEL 10 lifetime. Adapted from the corresponding RHEL 9 change by Kalev Lember. Resolves: Resolves: RHEL-30208
29 lines
1.0 KiB
Diff
29 lines
1.0 KiB
Diff
From 00414eb67ab0591911167155963b5524fbf2b0c0 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
|
|
Date: Mon, 9 Aug 2021 14:38:58 +0200
|
|
Subject: [PATCH] Don't throw InvalidOptionError on invalid options
|
|
|
|
---
|
|
python/mozbuild/mozbuild/configure/__init__.py | 5 +----
|
|
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
|
|
diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py
|
|
index f3167f6..c9e1132 100644
|
|
--- a/python/mozbuild/mozbuild/configure/__init__.py
|
|
+++ b/python/mozbuild/mozbuild/configure/__init__.py
|
|
@@ -557,10 +557,7 @@ class ConfigureSandbox(dict):
|
|
for arg in self._helper:
|
|
without_value = arg.split("=", 1)[0]
|
|
msg = "Unknown option: %s" % without_value
|
|
- if self._help:
|
|
- self._logger.warning(msg)
|
|
- else:
|
|
- raise InvalidOptionError(msg)
|
|
+ self._logger.warning(msg)
|
|
|
|
# Run the execution queue
|
|
for func, args in self._execution_queue:
|
|
--
|
|
2.31.1
|
|
|