cvs: php4 /pear/PEAR Common.php Config.php Dependency.php Installer.php Registry.php /pear/PEAR/Command Install.php Registry.php Remote.php
/pear/PEAR/Frontend CLI.php

cox Wed Jun 19 19:39:05 2002 EDT Modified files: /php4/pear/PEAR Common.php Config.php Dependency.php Installer.php Registry.php /php4/pear/PEAR/Command Install.php Registry.php Remote.php /php4/pear/PEAR/Frontend CLI.php Log: - Force params to version_compare() to be strings, otherwise some comparations will fail (ex. 0.9 will be equal to 0.90) - Other minor cleanup's

Index: php4/pear/PEAR/Common.php diff -u php4/pear/PEAR/Common.php:1.74 php4/pear/PEAR/Common.php:1.75 --- php4/pear/PEAR/Common.php:1.74 Mon Jun 17 06:52:21 2002 +++ php4/pear/PEAR/Common.php Wed Jun 19 19:38:45 2002 @@ -17,7 +17,7 @@ // | Tomas V.V.Cox <cox@idecnet.com> | // +----------------------------------------------------------------------+ // -// $Id: Common.php,v 1.74 2002/06/17 10:52:21 alan_k Exp $ +// $Id: Common.php,v 1.75 2002/06/19 23:38:45 cox Exp $ require_once 'PEAR.php'; require_once 'Archive/Tar.php'; @@ -974,11 +974,11 @@ function validatePackageInfo($info, &$errors, &$warnings) { global $_PEAR_Common_maintainer_roles, - $_PEAR_Common_release_states, - $_PEAR_Common_dependency_types, - $_PEAR_Common_dependency_relations, - $_PEAR_Common_file_roles, - $_PEAR_Common_replacement_types; + $_PEAR_Common_release_states, + $_PEAR_Common_dependency_types, + $_PEAR_Common_dependency_relations, + $_PEAR_Common_file_roles, + $_PEAR_Common_replacement_types; if (PEAR::isError($info = $this->infoFromAny($info))) { return $this->raiseError($info); } Index: php4/pear/PEAR/Config.php diff -u php4/pear/PEAR/Config.php:1.30 php4/pear/PEAR/Config.php:1.31 --- php4/pear/PEAR/Config.php:1.30 Mon Jun 17 09:56:38 2002 +++ php4/pear/PEAR/Config.php Wed Jun 19 19:38:46 2002 @@ -16,7 +16,7 @@ // | Author: Stig Bakken <ssb@fast.no> | // +----------------------------------------------------------------------+ // -// $Id: Config.php,v 1.30 2002/06/17 13:56:38 ssb Exp $ +// $Id: Config.php,v 1.31 2002/06/19 23:38:46 cox Exp $ require_once 'PEAR.php'; @@ -453,7 +453,7 @@ $version = $matches[1]; $contents = substr($contents, strlen($matches[0])); } - if (version_compare($version, '1', '<')) { + if (version_compare("$version", '1', '<')) { $data = unserialize($contents); if (!is_array($data)) { if (strlen(trim($contents)) > 0) { @@ -601,7 +601,7 @@ } extract($this->configuration_info[$key]); switch ($type) { - case 'integer': + case 'integer': $value = (int)$value; break; case 'set': { Index: php4/pear/PEAR/Dependency.php diff -u php4/pear/PEAR/Dependency.php:1.12 php4/pear/PEAR/Dependency.php:1.13 --- php4/pear/PEAR/Dependency.php:1.12 Mon Jun 17 09:50:33 2002 +++ php4/pear/PEAR/Dependency.php Wed Jun 19 19:38:46 2002 @@ -17,7 +17,7 @@ // | Stig Bakken <ssb@fast.no> | // +----------------------------------------------------------------------+ // -// $Id: Dependency.php,v 1.12 2002/06/17 13:50:33 cox Exp $ +// $Id: Dependency.php,v 1.13 2002/06/19 23:38:46 cox Exp $ /** * Methods for dependencies check. Based on Stig's dependencies RFC @@ -112,7 +112,7 @@ case 'gt': $version = $this->registry->packageInfo($name, 'version'); if (!$this->registry->packageExists($name) - || !version_compare($version, $req, $relation)) + || !version_compare("$version", "$req", $relation)) { return "requires package `$name' " . $this->signOperator($relation) . " $req"; @@ -143,7 +143,8 @@ if (substr($relation, 0, 2) == 'v.') { $ext_ver = phpversion($name); $operator = substr($relation, 2); - if (!version_compare($ext_ver, $req, $operator)) { + // Force params to be strings, otherwise the comparation will fail (ex. 0.9==0.90) + if (!version_compare("$ext_ver", "$req", $operator)) { return "'$name' PHP extension version " . $this->signOperator($operator) . " $req is required"; } @@ -183,7 +184,7 @@ if (substr($relation, 0, 2) == 'v.') { $php_ver = phpversion(); $operator = substr($relation, 2); - if (!version_compare($php_ver, $req, $operator)) { + if (!version_compare("$php_ver", "$req", $operator)) { return "PHP version " . $this->signOperator($operator) . " $req is required"; } Index: php4/pear/PEAR/Installer.php diff -u php4/pear/PEAR/Installer.php:1.69 php4/pear/PEAR/Installer.php:1.70 --- php4/pear/PEAR/Installer.php:1.69 Wed Jun 19 18:51:29 2002 +++ php4/pear/PEAR/Installer.php Wed Jun 19 19:38:46 2002 @@ -17,7 +17,7 @@ // | Tomas V.V.Cox <cox@idecnet.com> | // +----------------------------------------------------------------------+ // -// $Id: Installer.php,v 1.69 2002/06/19 22:51:29 cox Exp $ +// $Id: Installer.php,v 1.70 2002/06/19 23:38:46 cox Exp $ require_once 'PEAR/Common.php'; require_once 'PEAR/Registry.php'; @@ -427,8 +427,8 @@ } $v1 = $this->registry->packageInfo($pkgname, 'version'); $v2 = $pkginfo['version']; - $cmp = version_compare($v1, $v2, 'gt'); - if (empty($options['force']) && !version_compare($v2, $v1, 'gt')) { + $cmp = version_compare("$v1", "$v2", 'gt'); + if (empty($options['force']) && !version_compare("$v2", "$v1", 'gt')) { return $this->raiseError("upgrade to a newer version ($v2 is not newer than $v1)"); } if (empty($options['register-only'])) { Index: php4/pear/PEAR/Registry.php diff -u php4/pear/PEAR/Registry.php:1.30 php4/pear/PEAR/Registry.php:1.31 --- php4/pear/PEAR/Registry.php:1.30 Thu Jun 13 11:10:42 2002 +++ php4/pear/PEAR/Registry.php Wed Jun 19 19:38:47 2002 @@ -18,7 +18,7 @@ // | | // +----------------------------------------------------------------------+ // -// $Id: Registry.php,v 1.30 2002/06/13 15:10:42 cox Exp $ +// $Id: Registry.php,v 1.31 2002/06/19 23:38:47 cox Exp $ /* TODO: @@ -561,7 +561,7 @@ // XXX (cox) Possible problem with changes in the way // PEAR_Dependency::checkPackage() works if ($relation != 'has') { - if (!version_compare($new_version, $require, $relation)) { + if (!version_compare("$new_version", "$require", $relation)) { $fails[] = $dep; } } Index: php4/pear/PEAR/Command/Install.php diff -u php4/pear/PEAR/Command/Install.php:1.33 php4/pear/PEAR/Command/Install.php:1.34 --- php4/pear/PEAR/Command/Install.php:1.33 Thu Jun 6 06:51:26 2002 +++ php4/pear/PEAR/Command/Install.php Wed Jun 19 19:38:48 2002 @@ -16,7 +16,7 @@ // | Author: Stig Sæther Bakken <ssb@fast.no> | // +----------------------------------------------------------------------+ // -// $Id: Install.php,v 1.33 2002/06/06 10:51:26 ssb Exp $ +// $Id: Install.php,v 1.34 2002/06/19 23:38:48 cox Exp $ require_once "PEAR/Command/Common.php"; require_once "PEAR/Installer.php"; @@ -182,13 +182,16 @@ if (empty($this->installer)) { $this->installer = &new PEAR_Installer($this->ui); } + if (sizeof($params) < 1) { + return $this->raiseError("Please supply the package(s) you want to uninstall"); + } foreach ($params as $pkg) { if ($this->installer->uninstall($pkg, $options)) { if ($this->config->get('verbose') > 0) { - $this->ui->outputData("uninstall ok", $command); + $this->ui->outputData("uninstall $pkg ok", $command); } } else { - return $this->raiseError("uninstall failed"); + return $this->raiseError("uninstall $pkg failed"); } } return true; Index: php4/pear/PEAR/Command/Registry.php diff -u php4/pear/PEAR/Command/Registry.php:1.23 php4/pear/PEAR/Command/Registry.php:1.24 --- php4/pear/PEAR/Command/Registry.php:1.23 Fri Jun 7 06:20:41 2002 +++ php4/pear/PEAR/Command/Registry.php Wed Jun 19 19:38:49 2002 @@ -17,7 +17,7 @@ // | | // +----------------------------------------------------------------------+ // -// $Id: Registry.php,v 1.23 2002/06/07 10:20:41 cox Exp $ +// $Id: Registry.php,v 1.24 2002/06/19 23:38:49 cox Exp $ require_once 'PEAR/Command/Common.php'; require_once 'PEAR/Registry.php'; @@ -189,13 +189,13 @@ // "pear shell-test Foo 1.0" } elseif (sizeof($params) == 2) { $v = $reg->packageInfo($params[0], 'version'); - if (!$v || !version_compare($v, $params[1], "ge")) { + if (!$v || !version_compare("$v", "{$params[1]}", "ge")) { exit(1); } // "pear shell-test Foo ge 1.0" } elseif (sizeof($params) == 3) { $v = $reg->packageInfo($params[0], 'version'); - if (!$v || !version_compare($v, $params[2], $params[1])) { + if (!$v || !version_compare("$v", "{$params[2]}", $params[1])) { exit(1); } } else { Index: php4/pear/PEAR/Command/Remote.php diff -u php4/pear/PEAR/Command/Remote.php:1.17 php4/pear/PEAR/Command/Remote.php:1.18 --- php4/pear/PEAR/Command/Remote.php:1.17 Fri Jun 14 11:03:29 2002 +++ php4/pear/PEAR/Command/Remote.php Wed Jun 19 19:38:54 2002 @@ -17,7 +17,7 @@ // | | // +----------------------------------------------------------------------+ // -// $Id: Remote.php,v 1.17 2002/06/14 15:03:29 alan_k Exp $ +// $Id: Remote.php,v 1.18 2002/06/19 23:38:54 cox Exp $ require_once 'PEAR/Command/Common.php'; require_once 'PEAR/Common.php'; @@ -125,7 +125,7 @@ $info['installed'] = $installed['version'] ? $installed['version'] : '- no -'; $this->ui->outputData($info, $command); - + return true; } @@ -190,7 +190,7 @@ continue; if ($options['mode'] == 'notinstalled' && isset($installed['version'])) continue; - if ($options['mode'] == 'upgrades' + if ($options['mode'] == 'upgrades' && (!isset($installed['version']) || $installed['version'] == $info['stable'])) { continue; @@ -329,7 +329,7 @@ } extract($info); $inst_version = $reg->packageInfo($package, 'version'); - if (version_compare($version, $inst_version, "le")) { + if (version_compare("$version", "$inst_version", "le")) { // installed version is up-to-date continue; } @@ -344,7 +344,11 @@ } $data['data'][] = array($package, $version, $fs); } - $this->ui->outputData($data, $command); + if (empty($data['data'])) { + $this->ui->outputData('No upgrades avaible'); + } else { + $this->ui->outputData($data, $command); + } return true; } Index: php4/pear/PEAR/Frontend/CLI.php diff -u php4/pear/PEAR/Frontend/CLI.php:1.21 php4/pear/PEAR/Frontend/CLI.php:1.22 --- php4/pear/PEAR/Frontend/CLI.php:1.21 Sun Jun 9 14:12:59 2002 +++ php4/pear/PEAR/Frontend/CLI.php Wed Jun 19 19:38:59 2002 @@ -16,7 +16,7 @@ | Author: Stig Sæther Bakken <ssb@fast.no> | +----------------------------------------------------------------------+ - $Id: CLI.php,v 1.21 2002/06/09 18:12:59 cox Exp $ + $Id: CLI.php,v 1.22 2002/06/19 23:38:59 cox Exp $ */ require_once "PEAR.php"; @@ -422,7 +422,7 @@ $count = count($data['data'][0]); if ($count == 2) { $opts = array(0 => array('wrap' => 25), - 1 => array('wrap' => 50) + 1 => array('wrap' => 48) ); } elseif ($count == 3) { $opts = array(0 => array('wrap' => 20),