Commit 594fc16
authored
### Rationale for this change
There are two problems:
`with_read_timeout` can't set timeout:
/host/binary-task.rb:463:in `with_read_timeout': undefined method `read_timeout' for nil:NilClass (NoMethodError)
current_timeout = @ http.read_timeout
^^^^^^^^^^^^^
from /host/binary-task.rb:680:in `block in copy'
from /host/binary-task.rb:442:in `with_retry'
from /host/binary-task.rb:679:in `copy'
from /host/binary-task.rb:1100:in `block (3 levels) in release'
from /host/binary-task.rb:746:in `pull'
from /host/binary-task.rb:1099:in `block (2 levels) in release'
from /host/binary-task.rb:48:in `block (3 levels) in initialize'
from /host/binary-task.rb:45:in `loop'
from /host/binary-task.rb:45:in `block (2 levels) in initialize'
`yum:release` can't download a distribution:
ArgumentError: wrong number of arguments (given 3, expected 4)
/host/binary-task.rb:1266:in `download_distribution'
/host/binary-task.rb:2129:in `block (3 levels) in define_yum_release_tasks'
/host/binary-task.rb:2124:in `each'
/host/binary-task.rb:2124:in `block (2 levels) in define_yum_release_tasks'
### What changes are included in this PR?
* Defer timeout set timing for `with_read_timeout`
* Add missing `type` argument for `yum:release`
### Are these changes tested?
Yes. I used this for 20.0.0.
### Are there any user-facing changes?
No.
* GitHub Issue: #46236
Authored-by: Sutou Kouhei <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
1 parent 1807297 commit 594fc16
1 file changed
+34
-27
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
268 | 268 | | |
269 | 269 | | |
270 | 270 | | |
| 271 | + | |
271 | 272 | | |
272 | 273 | | |
273 | 274 | | |
| |||
302 | 303 | | |
303 | 304 | | |
304 | 305 | | |
305 | | - | |
306 | | - | |
307 | | - | |
308 | | - | |
309 | | - | |
310 | | - | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
311 | 325 | | |
312 | | - | |
313 | | - | |
314 | | - | |
315 | | - | |
316 | | - | |
317 | | - | |
318 | | - | |
319 | | - | |
320 | | - | |
321 | | - | |
322 | | - | |
323 | | - | |
324 | | - | |
325 | | - | |
326 | | - | |
327 | | - | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
328 | 334 | | |
329 | | - | |
330 | 335 | | |
| 336 | + | |
| 337 | + | |
331 | 338 | | |
332 | 339 | | |
333 | 340 | | |
| |||
460 | 467 | | |
461 | 468 | | |
462 | 469 | | |
463 | | - | |
| 470 | + | |
464 | 471 | | |
465 | | - | |
466 | 472 | | |
467 | 473 | | |
468 | | - | |
| 474 | + | |
469 | 475 | | |
470 | 476 | | |
471 | 477 | | |
| |||
2125 | 2131 | | |
2126 | 2132 | | |
2127 | 2133 | | |
2128 | | - | |
| 2134 | + | |
| 2135 | + | |
2129 | 2136 | | |
2130 | 2137 | | |
2131 | 2138 | | |
| |||
0 commit comments