cox Mon Jun 30 09:12:50 2003 EDT
Modified files:
/php-src/pear/PEAR/Frontend CLI.php
/php-src/pear/PEAR/Command Remote.php
Log:
Added local version installed in "list-upgrades"
(http://bugs.php.net/bug.php?id=24298)
Index: php-src/pear/PEAR/Frontend/CLI.php
diff -u php-src/pear/PEAR/Frontend/CLI.php:1.33 php-src/pear/PEAR/Frontend/CLI.php:1.34
--- php-src/pear/PEAR/Frontend/CLI.php:1.33 Tue Jun 10 16:03:43 2003
+++ php-src/pear/PEAR/Frontend/CLI.php Mon Jun 30 09:12:50 2003
@@no-spam -16,7 +16,7 @@no-spam
| Author: Stig Sæther Bakken <ssb@no-spam> |
+----------------------------------------------------------------------+
- $Id: CLI.php,v 1.33 2003/06/10 20:03:43 imajes Exp $
+ $Id: CLI.php,v 1.34 2003/06/30 13:12:50 cox Exp $
*/
require_once "PEAR.php";
@@no-spam -449,6 +449,8 @@no-spam
1 => array('wrap' => 20),
2 => array('wrap' => 35)
);
+ } else {
+ $opts = null;
}
if (isset($data['headline']) && is_array($data['headline'])) {
$this->_tableRow($data['headline'],
Index: php-src/pear/PEAR/Command/Remote.php
diff -u php-src/pear/PEAR/Command/Remote.php:1.31 php-src/pear/PEAR/Command/Remote.php:1.32
--- php-src/pear/PEAR/Command/Remote.php:1.31 Fri Jun 27 06:59:43 2003
+++ php-src/pear/PEAR/Command/Remote.php Mon Jun 30 09:12:50 2003
@@no-spam -17,7 +17,7 @@no-spam
// | |
// +----------------------------------------------------------------------+
//
-// $Id: Remote.php,v 1.31 2003/06/27 10:59:43 pajoye Exp $
+// $Id: Remote.php,v 1.32 2003/06/30 13:12:50 cox Exp $
require_once 'PEAR/Command/Common.php';
require_once 'PEAR/Common.php';
@@no-spam -332,7 +332,7 @@no-spam
$data = array(
'caption' => $caption,
'border' => 1,
- 'headline' => array('Package', 'Version', 'Size'),
+ 'headline' => array('Package', 'Local', 'Remote', 'Size'),
);
foreach ($latest as $pkg => $info) {
$package = strtolower($pkg);
@@no-spam -355,7 +355,7 @@no-spam
} else {
$fs = " -"; // XXX center instead
}
- $data['data'][] = array($pkg, $version, $fs);
+ $data['data'][] = array($pkg, $inst_version, $version, $fs);
}
if (empty($data['data'])) {
$this->ui->outputData('No upgrades available');