From 3dd47bc6518380251c422ed18ca12d062a1d20c6 Mon Sep 17 00:00:00 2001 From: Christian Dickmann Date: Sat, 8 Jun 2002 18:44:34 +0000 Subject: [PATCH] add modes to list-all. fix a mergerbug --- pear/PEAR/Command/Config.php | 3 --- pear/PEAR/Command/Remote.php | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pear/PEAR/Command/Config.php b/pear/PEAR/Command/Config.php index 2639ad77f7..b8f14511dd 100644 --- a/pear/PEAR/Command/Config.php +++ b/pear/PEAR/Command/Config.php @@ -147,9 +147,6 @@ displays help for all configuration parameters. $failmsg .= $error; return PEAR::raiseError($failmsg); } - if ($params[0] == 'umask') { - list($params[1]) = sscanf($params[1], '%o'); - } if (!call_user_func_array(array(&$this->config, 'set'), $params)) { $failmsg = "config-set (" . implode(", ", $params) . ") failed"; diff --git a/pear/PEAR/Command/Remote.php b/pear/PEAR/Command/Remote.php index 9cb8106e54..3ae167a255 100644 --- a/pear/PEAR/Command/Remote.php +++ b/pear/PEAR/Command/Remote.php @@ -125,6 +125,8 @@ version of DB is 1.2, the downloaded file will be DB-1.2.tgz.', $info['installed'] = $installed['version'] ? $installed['version'] : '- no -'; $this->ui->outputData($info, $command); + + return true; } // }}} @@ -176,6 +178,19 @@ version of DB is 1.2, the downloaded file will be DB-1.2.tgz.', if (isset($params[$name])) $desc .= "\n\n".$info['description']; + if (isset($options['mode'])) + { + if ($options['mode'] == 'installed' && !isset($installed['version'])) + continue; + if ($options['mode'] == 'notinstalled' && isset($installed['version'])) + continue; + if ($options['mode'] == 'upgrades' + && (!isset($installed['version']) || $installed['version'] == $info['stable'])) + { + continue; + }; + }; + $data['data'][$info['category']][] = array( $name, $info['stable'], -- 2.40.0