cvs: pear-core /PEAR Installer.php
| From: | Greg Beaver | Date: | Thu, 18 Aug 2005 12:45:52 +0000 |
| Subject: | cvs: pear-core /PEAR Installer.php | ||
| Groups: | php.pear.cvs php.pear.core | ||
| Request: | Send a blank email to pear-cvs+get-34114@lists.php.net to get a copy of this message | ||
cellog Thu Aug 18 08:45:52 2005 EDT
Modified files:
/pear-core/PEAR Installer.php
Log:
partial fix for bug #5133: installer fails when installing into an empty directory
http://cvs.php.net/diff.php/pear-core/PEAR/Installer.php?r1=1.210&r2=1.211&ty=u
Index: pear-core/PEAR/Installer.php
diff -u pear-core/PEAR/Installer.php:1.210 pear-core/PEAR/Installer.php:1.211
--- pear-core/PEAR/Installer.php:1.210 Sun Aug 14 02:49:18 2005
+++ pear-core/PEAR/Installer.php Thu Aug 18 08:45:50 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.210 2005/08/14 06:49:18 cellog Exp $
+ * @version CVS: $Id: Installer.php,v 1.211 2005/08/18 12:45:50 cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -991,6 +991,9 @@
if (empty($options['force'])) {
$testp = $channel == 'pear.php.net' ? $pkgname : array($channel, $pkgname);
$test = $this->_registry->checkFileMap($pkg->getInstallationFileList(true),
$testp, '1.1');
+ if (PEAR::isError($test)) {
+ return $test;
+ }
if (sizeof($test)) {
$pkgs = $this->getInstallPackages();
$found = false;