summaryrefslogtreecommitdiff
path: root/source/l/mozjs68/patches/icu_sources_data-Write-command-output-to-our-stderr.patch
blob: e2ed484544378a381ba481f06eef07a36510b2e4 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
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
@@ -187,16 +187,13 @@

 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