From 769aafaaad11da562983448da42b8c53402ca9a1 Mon Sep 17 00:00:00 2001 From: onefang Date: Thu, 23 Feb 2023 02:48:09 +1000 Subject: The -v option for timeout is new, not everyone has it. --- apt-panopticommon.lua | 4 ++-- update_apt-panopticon | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apt-panopticommon.lua b/apt-panopticommon.lua index a2def5a..04a339a 100644 --- a/apt-panopticommon.lua +++ b/apt-panopticommon.lua @@ -547,9 +547,9 @@ APT.exe = function(c) -- timeout returns a status of - command status if --preserve-status; "128+9" (actually 137) if --kill-after ends up being done; 124 if it had to TERM; command status if all went well. -- --kill-after means "send KILL after TERM fails. if nil == c then - self.cmd = 'timeout --kill-after=10.0 --foreground -v 42.0s ' .. self.cmd + self.cmd = 'timeout --kill-after=10.0 --foreground 42.0s ' .. self.cmd else - self.cmd = 'timeout --kill-after=10.0 --foreground -v ' .. c .. ' ' .. self.cmd + self.cmd = 'timeout --kill-after=10.0 --foreground ' .. c .. ' ' .. self.cmd end return self end diff --git a/update_apt-panopticon b/update_apt-panopticon index abbc154..180f090 100755 --- a/update_apt-panopticon +++ b/update_apt-panopticon @@ -29,7 +29,7 @@ if [ -f apt-panopticon.lock ] ; then fi rm ../results; ln -s apt-panopticon/results_old ../results -flock -n apt-panopticon.lock ionice -c3 nice -n 19 timeout --kill-after=20.0 --foreground -v 8.5m ./apt-panopticon.lua && rm apt-panopticon.lock +flock -n apt-panopticon.lock ionice -c3 nice -n 19 timeout --kill-after=20.0 --foreground 8.5m ./apt-panopticon.lua && rm apt-panopticon.lock if [ -f apt-panopticon.lock ] ; then echo "apt-panopticon timed out." ./laggers -- cgit v1.1