diff options
| author | Renato Botelho <renato@netgate.com> | 2016-03-16 16:16:46 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-03-16 16:19:53 -0300 |
| commit | 1c9818970fcc994d6599d794047397655f867a12 (patch) | |
| tree | 5874ef5ebaaaf7079836905fd012a55404afecd0 /src | |
| parent | a948633c5c19e3ec8669f13103236258d72992d6 (diff) | |
| download | pfsense-1c9818970fcc994d6599d794047397655f867a12.zip pfsense-1c9818970fcc994d6599d794047397655f867a12.tar.gz | |
Remove workaround introduced in a2febf9a0. It reduces download timeout to 10s and break update from 2.2 to 2.3
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/inc/pkg-utils.inc | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/etc/inc/pkg-utils.inc b/src/etc/inc/pkg-utils.inc index 8cb3bfc..836e334 100644 --- a/src/etc/inc/pkg-utils.inc +++ b/src/etc/inc/pkg-utils.inc @@ -157,8 +157,6 @@ function pkg_call($params, $mute = false, $extra_env = array()) { /* XXX: should be a tunnable? */ $timeout = 300; // seconds $error_log = ''; - $started = time(); - $maxwaittime = 10; // Number of seconds to wait for a response fromteh pacakge we are calling do { $write = array(); @@ -184,15 +182,6 @@ function pkg_call($params, $mute = false, $extra_env = array()) { } $status = proc_get_status($process); - - $now = time(); - - if (($now - $started) >= $maxwaittime) { - $rc = -1; - proc_terminate($process); - break; - } - } while ($status['running']); fclose($pipes[1]); @@ -201,9 +190,7 @@ function pkg_call($params, $mute = false, $extra_env = array()) { conf_mount_ro(); - if (!isset($rc)) { - $rc = $status['exitcode']; - } + $rc = $status['exitcode']; pkg_debug("pkg_call(): rc = {$rc}\n"); if ($rc == 0) { |
