Revision 4e322e2c
Added by Phil Davis over 9 years ago
| src/etc/inc/pkg-utils.inc | ||
|---|---|---|
| 192 | 192 |
|
| 193 | 193 |
$now = time(); |
| 194 | 194 |
|
| 195 |
if(($now - $started) >= $maxwaittime) {
|
|
| 195 |
if (($now - $started) >= $maxwaittime) {
|
|
| 196 | 196 |
$rc = -1; |
| 197 | 197 |
proc_terminate($process); |
| 198 | 198 |
break; |
| ... | ... | |
| 204 | 204 |
fclose($pipes[2]); |
| 205 | 205 |
proc_close($process); |
| 206 | 206 |
|
| 207 |
if(!isset($rc)) {
|
|
| 207 |
if (!isset($rc)) {
|
|
| 208 | 208 |
$rc = $status['exitcode']; |
| 209 | 209 |
} |
| 210 | 210 |
|
| ... | ... | |
| 353 | 353 |
|
| 354 | 354 |
foreach ($config['installedpackages']['package'] as $idx => $pkg) {
|
| 355 | 355 |
if ($pkg['name'] == $package_name || |
| 356 |
get_package_internal_name($pkg) == $package_name) {
|
|
| 356 |
get_package_internal_name($pkg) == $package_name) {
|
|
| 357 | 357 |
return $idx; |
| 358 | 358 |
} |
| 359 | 359 |
} |
Also available in: Unified diff
Code style and white space in etc