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
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From: Simon McVittie <smcv@debian.org>
|
|
Date: Mon, 9 Oct 2017 09:23:14 +0100
|
|
Subject: icu_sources_data: Write command output to our stderr
|
|
|
|
Saying "See output in /tmp/foobar" is all very well for a developer
|
|
build, but on a buildd our /tmp is going to get thrown away after
|
|
the build. Just log the usual way instead.
|
|
---
|
|
intl/icu_sources_data.py | 16 ++++------------
|
|
1 file changed, 4 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py
|
|
index 4db52af..d62960d 100644
|
|
--- a/intl/icu_sources_data.py
|
|
+++ b/intl/icu_sources_data.py
|
|
@@ -188,21 +188,13 @@ def update_sources(topsrcdir):
|
|
|
|
def try_run(name, command, cwd=None, **kwargs):
|
|
try:
|
|
- with tempfile.NamedTemporaryFile(prefix=name, delete=False) as f:
|
|
- subprocess.check_call(
|
|
- command, cwd=cwd, stdout=f, stderr=subprocess.STDOUT, **kwargs
|
|
- )
|
|
- except subprocess.CalledProcessError:
|
|
- print(
|
|
- """Error running "{}" in directory {}
|
|
- See output in {}""".format(
|
|
- " ".join(command), cwd, f.name
|
|
- ),
|
|
- file=sys.stderr,
|
|
+ subprocess.check_call(
|
|
+ command, cwd=cwd, stdout=sys.stderr, stderr=subprocess.STDOUT, **kwargs
|
|
)
|
|
+ except subprocess.CalledProcessError:
|
|
+ print('''Error running "{}" in directory {}'''.format(' '.join(command), cwd), file=sys.stderr)
|
|
return False
|
|
else:
|
|
- os.unlink(f.name)
|
|
return True
|
|
|
|
|
|
--
|
|
2.31.1
|
|
|