aboutsummaryrefslogtreecommitdiffstats
path: root/testing/redo/skip-when-tty-missing.patch
diff options
context:
space:
mode:
authorKevin Daudt <kdaudt@alpinelinux.org>2019-01-28 11:41:08 +0000
committerCarlo Landmeter <clandmeter@alpinelinux.org>2019-01-28 12:02:37 +0000
commite57890e734b9727cbd98241b46832dbeb2535b1e (patch)
tree0c7807ca5c0b2c59214a4e5e8f927cbb12dd096b /testing/redo/skip-when-tty-missing.patch
parent6327c4b8f67b993d5ca5d79924fe0e2c6551c798 (diff)
downloadaports-e57890e734b9727cbd98241b46832dbeb2535b1e.tar.bz2
aports-e57890e734b9727cbd98241b46832dbeb2535b1e.tar.xz
testing/redo: fix check failing due to missing /dev/tty
On the builders, the checks failed because they tried to open /dev/tty, which does not exists. Add a patch that continues when /dev/tty is missing. Re-enable redo
Diffstat (limited to 'testing/redo/skip-when-tty-missing.patch')
-rw-r--r--testing/redo/skip-when-tty-missing.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/testing/redo/skip-when-tty-missing.patch b/testing/redo/skip-when-tty-missing.patch
new file mode 100644
index 0000000000..8acefbacd9
--- /dev/null
+++ b/testing/redo/skip-when-tty-missing.patch
@@ -0,0 +1,20 @@
+diff --git a/redo/builder.py b/redo/builder.py.new
+index e55955f7f9..160cba8dfe 100644
+--- a/redo/builder.py
++++ b/redo/builder.py.new
+@@ -1,5 +1,5 @@
+ """Code for parallel-building a set of targets, if needed."""
+-import errno, os, stat, signal, sys, tempfile, time
++import errno, os, os.path, stat, signal, sys, tempfile, time
+ from . import cycles, env, jobserver, logs, state, paths
+ from .helpers import unlink, close_on_exec
+ from .logs import debug2, err, warn, meta
+@@ -99,6 +99,8 @@ def await_log_reader():
+ if not env.v.LOG:
+ return
+ if log_reader_pid > 0:
++ if not os.path.exists('/dev/tty'):
++ return
+ # never actually close fd#1 or fd#2; insanity awaits.
+ # replace it with something else instead.
+ # Since our stdout/stderr are attached to redo-log's stdin,