Commit 259d326
committed
Do not let ensure_docker die in the ERR trap when nobody can answer
ensure_docker read the "Install Docker now?" answer straight off stdin with
no guard. Headless that read hits EOF and returns 1, and since catch_errors
turns on errexit with an ERR trap, the script died reporting a bare
"exit code 1" instead of the "Docker is required" message on the next line.
The decision is unchanged -- anything but yes still aborts with 254 -- but it
now says that the run was unattended and what to do about it, rather than
looking like a random failure.1 parent 0197438 commit 259d326
1 file changed
Lines changed: 11 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
181 | 181 | | |
182 | 182 | | |
183 | 183 | | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
184 | 194 | | |
185 | | - | |
186 | | - | |
| 195 | + | |
187 | 196 | | |
188 | 197 | | |
189 | 198 | | |
| |||
0 commit comments