aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2018-01-11 23:05:46 +0000
committerPascal Terjan <pterjan@mageia.org>2018-01-11 23:08:07 +0000
commitd04a33dc14f51fa2f920617d1eeae1d504544f56 (patch)
treed74d9f36e06cf0c939df813309eea2c8edc838f1
parentd01eddf575f322d11bd3b2e51403f0378d21d624 (diff)
downloadiurt-d04a33dc14f51fa2f920617d1eeae1d504544f56.tar
iurt-d04a33dc14f51fa2f920617d1eeae1d504544f56.tar.gz
iurt-d04a33dc14f51fa2f920617d1eeae1d504544f56.tar.bz2
iurt-d04a33dc14f51fa2f920617d1eeae1d504544f56.tar.xz
iurt-d04a33dc14f51fa2f920617d1eeae1d504544f56.zip
Default to 10 minutes for commands
Especially for large packages 5 minutes to recreate src.rpm is not enough
-rw-r--r--NEWS2
-rw-r--r--lib/Iurt/Process.pm2
-rw-r--r--lib/Iurt/Urpmi.pm2
3 files changed, 3 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 7819c54..ee97552 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- increase default timeout for commands to 10 minutes
+
0.7.5
- iurt: fix checking if chroot needs updating
diff --git a/lib/Iurt/Process.pm b/lib/Iurt/Process.pm
index dfecc46..99cfccf 100644
--- a/lib/Iurt/Process.pm
+++ b/lib/Iurt/Process.pm
@@ -216,7 +216,7 @@ Return true.
sub perform_command {
my ($command, $run, $config, %opt) = @_;
- $opt{timeout} ||= 300;
+ $opt{timeout} ||= 600;
$opt{freq} ||= 24;
$opt{type} ||= 'shell';
diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm
index 141d406..679a140 100644
--- a/lib/Iurt/Urpmi.pm
+++ b/lib/Iurt/Urpmi.pm
@@ -174,7 +174,6 @@ sub add_media__urpmi_root {
perform_command("urpmi-addmedia -v --urpmi-root $chroot $name $url --probe-synthesis",
$run, $config,
mail => $config->{admin},
- timeout => 300,
use_iurt_root_command => 1,
freq => 1,
retry => 2,
@@ -199,7 +198,6 @@ sub add_media {
perform_command($cmd,
$run, $config,
mail => $config->{admin},
- timeout => 300,
freq => 1,
retry => 2,
use_iurt_root_command => 1,