19febb8bec
Bundling mozjs in both gjs and polkit should make it possible to remove the system wide mozjs78 package from base RHEL 9, 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 mozjs78 for all of RHEL 9 lifetime. Resolves: #1958111
35 lines
1.4 KiB
Diff
35 lines
1.4 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 | 7 ++-----
|
|
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py
|
|
index 8cf9290..7d2d983 100644
|
|
--- a/intl/icu_sources_data.py
|
|
+++ b/intl/icu_sources_data.py
|
|
@@ -190,16 +190,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)
|
|
+ subprocess.check_call(command, cwd=cwd, stdout=sys.stderr,
|
|
+ stderr=subprocess.STDOUT, **kwargs)
|
|
except subprocess.CalledProcessError:
|
|
- print('''Error running "{}" in directory {}
|
|
- See output in {}'''.format(' '.join(command), cwd, f.name),
|
|
- file=sys.stderr)
|
|
+ print('''Error running "{}" in directory {}'''.format(' '.join(command), cwd),
|
|
+ file=sys.stderr)
|
|
return False
|
|
else:
|
|
- os.unlink(f.name)
|
|
return True
|