cvs: pear-core /PEAR Installer.php
| From: | Greg Beaver | Date: | Thu, 18 Aug 2005 12:52:12 +0000 |
| Subject: | cvs: pear-core /PEAR Installer.php | ||
| Groups: | php.pear.cvs php.pear.core | ||
| Request: | Send a blank email to pear-cvs+get-34115@lists.php.net to get a copy of this message | ||
cellog Thu Aug 18 08:52:12 2005 EDT
Modified files:
/pear-core/PEAR Installer.php
Log:
the rest of a fix for bug #5133: installer fails when installing into an empty directory
# needs testing
http://cvs.php.net/diff.php/pear-core/PEAR/Installer.php?r1=1.211&r2=1.212&ty=u
Index: pear-core/PEAR/Installer.php
diff -u pear-core/PEAR/Installer.php:1.211 pear-core/PEAR/Installer.php:1.212
--- pear-core/PEAR/Installer.php:1.211 Thu Aug 18 08:45:50 2005
+++ pear-core/PEAR/Installer.php Thu Aug 18 08:52:09 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.211 2005/08/18 12:45:50 cellog Exp $
+ * @version CVS: $Id: Installer.php,v 1.212 2005/08/18 12:52:09 cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -988,7 +988,7 @@
$php_dir = $this->config->get('php_dir', null, $channel);
// {{{ checks to do when not in "force" mode
- if (empty($options['force'])) {
+ 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');
if (PEAR::isError($test)) {