cvs: php4 /pear/PEAR/Command Config.php Remote.php

dickmann Sat Jun 8 14:44:34 2002 EDT Modified files: /php4/pear/PEAR/Command Remote.php Config.php Log: add modes to list-all. fix a mergerbug Index: php4/pear/PEAR/Command/Remote.php diff -u php4/pear/PEAR/Command/Remote.php:1.15 php4/pear/PEAR/Command/Remote.php:1.16 --- php4/pear/PEAR/Command/Remote.php:1.15 Fri Jun 7 11:06:25 2002 +++ php4/pear/PEAR/Command/Remote.php Sat Jun 8 14:44:34 2002 @@ -17,7 +17,7 @@ // | | // +----------------------------------------------------------------------+ // -// $Id: Remote.php,v 1.15 2002/06/07 15:06:25 cox Exp $ +// $Id: Remote.php,v 1.16 2002/06/08 18:44:34 dickmann Exp $ require_once 'PEAR/Command/Common.php'; require_once 'PEAR/Common.php'; @@ -125,6 +125,8 @@ $info['installed'] = $installed['version'] ? $installed['version'] : '- no -'; $this->ui->outputData($info, $command); + + return true; } // }}} @@ -175,6 +177,19 @@ $desc = $info['summary']; 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, Index: php4/pear/PEAR/Command/Config.php diff -u php4/pear/PEAR/Command/Config.php:1.17 php4/pear/PEAR/Command/Config.php:1.18 --- php4/pear/PEAR/Command/Config.php:1.17 Fri Jun 7 10:50:39 2002 +++ php4/pear/PEAR/Command/Config.php Sat Jun 8 14:44:34 2002 @@ -18,7 +18,7 @@ // | | // +----------------------------------------------------------------------+ // -// $Id: Config.php,v 1.17 2002/06/07 14:50:39 cox Exp $ +// $Id: Config.php,v 1.18 2002/06/08 18:44:34 dickmann Exp $ require_once "PEAR/Command/Common.php"; require_once "PEAR/Config.php"; @@ -146,9 +146,6 @@ if ($error = $this->_checkLayer(@$params[2])) { $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)) {