add modes to list-all. fix a mergerbug

This commit is contained in:
Christian Dickmann 2002-06-08 18:44:34 +00:00
parent 5e148e3875
commit 3dd47bc651
2 changed files with 15 additions and 3 deletions

View File

@ -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";

View File

@ -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'],