cellog Sat Nov 5 12:59:06 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/pear install-pear.php
Log:
getVersion() is in wrong place, should there be a PEAR_Error
http://cvs.php.net/diff.php/php-src/pear/install-pear.php?r1=1.6.2.14.4.2&r2=1.6.2.14.4.3&ty=u
Index: php-src/pear/install-pear.php
diff -u php-src/pear/install-pear.php:1.6.2.14.4.2
php-src/pear/install-pear.php:1.6.2.14.4.3
--- php-src/pear/install-pear.php:1.6.2.14.4.2 Wed Nov 2 11:57:19 2005
+++ php-src/pear/install-pear.php Sat Nov 5 12:59:02 2005
@@ -1,6 +1,6 @@
<?php
-/* $Id: install-pear.php,v 1.6.2.14.4.2 2005/11/02 16:57:19 cellog Exp $ */
+/* $Id: install-pear.php,v 1.6.2.14.4.3 2005/11/05 17:59:02 cellog Exp $ */
error_reporting(E_ALL);
$pear_dir = dirname(__FILE__);
@@ -115,11 +115,11 @@
foreach ($install_files as $package => $instfile) {
$info = &$pkg->fromAnyFile($instfile, PEAR_VALIDATE_INSTALLING);
- $new_ver = $info->getVersion();
if (PEAR::isError($info)) {
$ui->outputData(sprintf("[PEAR] %s: %s", $package,
$info->getMessage()));
continue;
}
+ $new_ver = $info->getVersion();
$downloaderpackage = &new PEAR_Downloader_Package($installer);
$err = $downloaderpackage->initialize($instfile);
if (PEAR::isError($err)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
