cvs: pear-core / package-PEAR.xml package2.xml /PEAR Registry.php

cellog Thu Oct 20 18:13:48 2005 EDT Modified files: /pear-core/PEAR Registry.php /pear-core package-PEAR.xml package2.xml Log: * fix Bug #5736: if registry can't lock registry or open filemap, checkFileMap(), no error http://cvs.php.net/diff.php/pear-core/PEAR/Registry.php?r1=1.140&r2=1.141&ty=u Index: pear-core/PEAR/Registry.php diff -u pear-core/PEAR/Registry.php:1.140 pear-core/PEAR/Registry.php:1.141 --- pear-core/PEAR/Registry.php:1.140 Sun Sep 11 14:34:44 2005 +++ pear-core/PEAR/Registry.php Thu Oct 20 18:13:45 2005 @@ -17,7 +17,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: Registry.php,v 1.140 2005/09/11 18:34:44 cellog Exp $ + * @version CVS: $Id: Registry.php,v 1.141 2005/10/20 22:13:45 cellog Exp $ * @link http://pear.php.net/package/PEAR * @since File available since Release 0.1 */ @@ -1837,6 +1837,9 @@ } } $pkgs[$name] = $this->checkFileMap($name, $package, $api, $attrs); + if (PEAR::isError($pkgs[$name])) { + return $pkgs[$name]; + } } return array_filter($pkgs, $notempty); } http://cvs.php.net/diff.php/pear-core/package-PEAR.xml?r1=1.289&r2=1.290&ty=u Index: pear-core/package-PEAR.xml diff -u pear-core/package-PEAR.xml:1.289 pear-core/package-PEAR.xml:1.290 --- pear-core/package-PEAR.xml:1.289 Wed Oct 19 01:03:03 2005 +++ pear-core/package-PEAR.xml Thu Oct 20 18:13:47 2005 @@ -80,6 +80,8 @@ * fix writeable PEAR_Task_Postinstallscript_rw class * fix Bug #5717: analyzeSourceCode() fails to process certain quote situations properly + * fix Bug #5736: if registry can't lock registry or open filemap, + checkFileMap(), no error </notes> <provides type="class" name="OS_Guess"/> <provides type="class" name="System"/> http://cvs.php.net/diff.php/pear-core/package2.xml?r1=1.181&r2=1.182&ty=u Index: pear-core/package2.xml diff -u pear-core/package2.xml:1.181 pear-core/package2.xml:1.182 --- pear-core/package2.xml:1.181 Wed Oct 19 01:03:03 2005 +++ pear-core/package2.xml Thu Oct 20 18:13:47 2005 @@ -85,6 +85,8 @@ * fix writeable PEAR_Task_Postinstallscript_rw class * fix Bug #5717: analyzeSourceCode() fails to process certain quote situations properly + * fix Bug #5736: if registry can't lock registry or open filemap, + checkFileMap(), no error </notes> <contents> <dir name="/">