cvs: pear-core /PEAR Installer.php

cellog Sat Nov 12 01:42:33 2005 EDT Modified files: /pear-core/PEAR Installer.php Log: * fix Bug #5854: (*ix|*ux|darwin*|SunOS*) is not selecting linux when used as an installconditio http://cvs.php.net/diff.php/pear-core/PEAR/Installer.php?r1=1.221&r2=1.222&ty=u Index: pear-core/PEAR/Installer.php diff -u pear-core/PEAR/Installer.php:1.221 pear-core/PEAR/Installer.php:1.222 --- pear-core/PEAR/Installer.php:1.221 Sat Nov 5 13:29:40 2005 +++ pear-core/PEAR/Installer.php Sat Nov 12 01:42:33 2005 @@ -18,7 +18,7 @@ * @author Greg Beaver <cellog@php.net> * @copyright 1997-2005 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: Installer.php,v 1.221 2005/11/05 18:29:40 cellog Exp $ + * @version CVS: $Id: Installer.php,v 1.222 2005/11/12 06:42:33 cellog Exp $ * @link http://pear.php.net/package/PEAR * @since File available since Release 0.1 */ @@ -995,7 +995,11 @@ // {{{ checks to do when not in "force" mode if (empty($options['force']) && @is_dir($this->config->get('php_dir'))) { $testp = $channel == 'pear.php.net' ? $pkgname : array($channel, $pkgname); - $test = $this->_registry->checkFileMap($pkg->getInstallationFileList(true), $testp, '1.1'); + $instfilelist = $pkg->getInstallationFileList(true); + if (PEAR::isError($instfilelist)) { + return $instfilelist; + } + $test = $this->_registry->checkFileMap($instfilelist, $testp, '1.1'); if (PEAR::isError($test)) { return $test; } @@ -1144,6 +1148,9 @@ if ($pkg->getPackagexmlVersion() == '2.0') { $filelist = $pkg->getInstallationFilelist(); + if (PEAR::isError($filelist)) { + return $filelist; + } } else { $filelist = $pkg->getFileList(); }