Revision a835cdee
Added by Renato Botelho about 7 years ago
| src/etc/inc/pkg-utils.inc | ||
|---|---|---|
| 348 | 348 |
$pkgs = $g['pkg_prefix'] . '*'; |
| 349 | 349 |
|
| 350 | 350 |
if ($installed_pkgs_only && !is_pkg_installed($pkgs)) {
|
| 351 |
// Return early if the caller wants just installed packages and there are none. |
|
| 352 |
// Saves doing any calls that might access a remote package repo. |
|
| 351 |
/* |
|
| 352 |
* Return early if the caller wants just installed packages |
|
| 353 |
* and there are none. Saves doing any calls that might |
|
| 354 |
* access a remote package repo. |
|
| 355 |
*/ |
|
| 353 | 356 |
return array(); |
| 354 | 357 |
} |
| 355 | 358 |
|
| ... | ... | |
| 476 | 479 |
$err); |
| 477 | 480 |
|
| 478 | 481 |
if ($rc != 0) {
|
| 479 |
update_status("\n" . gettext(
|
|
| 480 |
"ERROR: Error trying to get package version. Aborting...")
|
|
| 481 |
. "\n"); |
|
| 482 |
update_status("\n" . gettext("ERROR: Error " .
|
|
| 483 |
"trying to get package version. " .
|
|
| 484 |
"Aborting...") . "\n");
|
|
| 482 | 485 |
update_status($err); |
| 483 |
$input_errors[] = gettext( |
|
| 484 |
"ERROR: Error trying to get package version. Aborting...") .
|
|
| 485 |
"\n"; |
|
| 486 |
$input_errors[] = gettext("ERROR: Error " .
|
|
| 487 |
"trying to get package version. " .
|
|
| 488 |
"Aborting...") . "\n";
|
|
| 486 | 489 |
$input_errors[] = $err; |
| 487 | 490 |
return array(); |
| 488 | 491 |
} |
| 489 | 492 |
|
| 490 |
$pkg_info['installed_version'] = str_replace("\n", "", $out);
|
|
| 493 |
$pkg_info['installed_version'] = str_replace("\n", "",
|
|
| 494 |
$out); |
|
| 491 | 495 |
|
| 492 | 496 |
/* |
| 493 |
* We used pkg info to collect pkg data so remote |
|
| 494 |
* version is not available. Lets try to collect it |
|
| 495 |
* using rquery if possible |
|
| 496 |
*/ |
|
| 497 |
* We used pkg info to collect pkg data so remote
|
|
| 498 |
* version is not available. Lets try to collect it
|
|
| 499 |
* using rquery if possible
|
|
| 500 |
*/
|
|
| 497 | 501 |
if ($search_rc != 0 || !$did_search) {
|
| 498 |
$rc = pkg_exec("rquery -U %v {$pkg_info['name']}", $out, $err);
|
|
| 502 |
$rc = pkg_exec( |
|
| 503 |
"rquery -U %v {$pkg_info['name']}", $out,
|
|
| 504 |
$err); |
|
| 499 | 505 |
|
| 500 | 506 |
if ($rc == 0) {
|
| 501 |
$pkg_info['version'] = str_replace("\n", "", $out);
|
|
| 507 |
$pkg_info['version'] = |
|
| 508 |
str_replace("\n", "", $out);
|
|
| 502 | 509 |
} |
| 503 | 510 |
} |
| 504 | 511 |
|
Also available in: Unified diff
Fix style