cvs: php-src(PHP_4) /pear package-PEAR.xml /pear/PEAR Registry.php /pear/PEAR/Command Remote.php

pajoye Wed Jun 25 12:27:01 2003 EDT Modified files: (Branch: PHP_4) /php-src/pear package-PEAR.xml /php-src/pear/PEAR Registry.php /php-src/pear/PEAR/Command Remote.php Log: - Restore Index: php-src/pear/package-PEAR.xml diff -u php-src/pear/package-PEAR.xml:1.28.2.9 php-src/pear/package-PEAR.xml:1.28.2.9.2.1 --- php-src/pear/package-PEAR.xml:1.28.2.9 Wed Jun 18 18:32:03 2003 +++ php-src/pear/package-PEAR.xml Wed Jun 25 12:27:01 2003 @@ -37,12 +37,13 @@ </maintainer> </maintainers> <release> - <version>1.2</version> - <state>stable</state> - <date>2003-01-10</date> + <version>1.2b2</version> + <state>beta</state> + <date>2003-06-23</date> <notes> * Changed license from PHP 2.02 to 3.0 * Added support for optional dependencies +* Made upgrade and uninstall package case insensitive * pear makerpm, now works and generates a better system independant spec file * pear install|build &lt;pecl-package&gt;, now exposes the compilation progress * Added new pear bundle command, which downloads and uncompress a &lt;pecl-package&gt;. Index: php-src/pear/PEAR/Registry.php diff -u php-src/pear/PEAR/Registry.php:1.35.2.6.2.2 php-src/pear/PEAR/Registry.php:1.35.2.6.2.3 --- php-src/pear/PEAR/Registry.php:1.35.2.6.2.2 Wed Jun 25 11:06:51 2003 +++ php-src/pear/PEAR/Registry.php Wed Jun 25 12:27:01 2003 @@ -18,7 +18,7 @@ // | | // +----------------------------------------------------------------------+ // -// $Id: Registry.php,v 1.35.2.6.2.2 2003/06/25 15:06:51 mj Exp $ +// $Id: Registry.php,v 1.35.2.6.2.3 2003/06/25 16:27:01 pajoye Exp $ /* TODO: @@ -98,6 +98,18 @@ $this->statedir = $pear_install_dir.$ds.'.registry'; $this->filemap = $pear_install_dir.$ds.'.filemap'; $this->lockfile = $pear_install_dir.$ds.'.lock'; + + // XXX Compatibility code should be removed in the future + // rename all registry files if any to lowercase + if (!OS_WINDOWS && $handle = opendir($this->statedir)) { + $dest = $this->statedir . DIRECTORY_SEPARATOR; + while (false !== ($file = readdir($handle))) { + if (preg_match('/^.*[A-Z].*\.reg$/', $file)) { + rename($dest . $file, $dest . strtolower($file)); + } + } + closedir($handle); + } if (!file_exists($this->filemap)) { $this->rebuildFileMap(); } Index: php-src/pear/PEAR/Command/Remote.php diff -u php-src/pear/PEAR/Command/Remote.php:1.22.2.7.2.1 php-src/pear/PEAR/Command/Remote.php:1.22.2.7.2.2 --- php-src/pear/PEAR/Command/Remote.php:1.22.2.7.2.1 Mon Jun 23 21:59:18 2003 +++ php-src/pear/PEAR/Command/Remote.php Wed Jun 25 12:27:01 2003 @@ -17,7 +17,7 @@ // | | // +----------------------------------------------------------------------+ // -// $Id: Remote.php,v 1.22.2.7.2.1 2003/06/24 01:59:18 sas Exp $ +// $Id: Remote.php,v 1.22.2.7.2.2 2003/06/25 16:27:01 pajoye Exp $ require_once 'PEAR/Command/Common.php'; require_once 'PEAR/Common.php'; @@ -334,7 +334,8 @@ 'border' => 1, 'headline' => array('Package', 'Version', 'Size'), ); - foreach ($latest as $package => $info) { + foreach ($latest as $pkg => $info) { + $package = strtolower($pkg); if (!isset($inst[$package])) { // skip packages we don't have installed continue; @@ -354,7 +355,7 @@ } else { $fs = " -"; // XXX center instead } - $data['data'][] = array($package, $version, $fs); + $data['data'][] = array($pkg, $version, $fs); } if (empty($data['data'])) { $this->ui->outputData('No upgrades available');