42 lines
1.5 KiB
Diff
42 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(-)
|
||
|
|
|
||
|
|
Index: firefox-115.1.0/intl/icu_sources_data.py
|
||
|
|
===================================================================
|
||
|
|
--- firefox-115.1.0.orig/intl/icu_sources_data.py
|
||
|
|
+++ firefox-115.1.0/intl/icu_sources_data.py
|
||
|
|
@@ -185,21 +185,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
|
||
|
|
|
||
|
|
|