diff options
-rw-r--r-- | apt-panopticommon.lua | 4 | ||||
-rwxr-xr-x | update_apt-panopticon | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apt-panopticommon.lua b/apt-panopticommon.lua index 7961ca4..1507ae9 100644 --- a/apt-panopticommon.lua +++ b/apt-panopticommon.lua | |||
@@ -551,9 +551,9 @@ APT.exe = function(c) | |||
551 | -- 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. | 551 | -- 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. |
552 | -- --kill-after means "send KILL after TERM fails. | 552 | -- --kill-after means "send KILL after TERM fails. |
553 | if nil == c then | 553 | if nil == c then |
554 | self.cmd = 'timeout --kill-after=10.0 --foreground 42.0s ' .. self.cmd | 554 | self.cmd = 'timeout --kill-after=10.0s --foreground 42.0s ' .. self.cmd |
555 | else | 555 | else |
556 | self.cmd = 'timeout --kill-after=10.0 --foreground ' .. c .. ' ' .. self.cmd | 556 | self.cmd = 'timeout --kill-after=10.0s --foreground ' .. c .. ' ' .. self.cmd |
557 | end | 557 | end |
558 | return self | 558 | return self |
559 | end | 559 | end |
diff --git a/update_apt-panopticon b/update_apt-panopticon index 969cc8f..384ebdb 100755 --- a/update_apt-panopticon +++ b/update_apt-panopticon | |||
@@ -42,7 +42,7 @@ if [ "z" != "z${KEEPDAYS}" ] ; then | |||
42 | fi | 42 | fi |
43 | 43 | ||
44 | rm ../results; ln -s apt-panopticon/results_old ../results | 44 | rm ../results; ln -s apt-panopticon/results_old ../results |
45 | 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 | 45 | flock -n apt-panopticon.lock ionice -c3 nice -n 19 timeout --kill-after=20.0s --foreground 8.5m ./apt-panopticon.lua && rm apt-panopticon.lock |
46 | if [ -f apt-panopticon.lock ] ; then | 46 | if [ -f apt-panopticon.lock ] ; then |
47 | echo "apt-panopticon timed out." | 47 | echo "apt-panopticon timed out." |
48 | ./laggers | 48 | ./laggers |