cvs: pear-core / package-PEAR.xml package2.xml /PEAR Config.php
| From: | Greg Beaver | Date: | Thu, 20 Oct 2005 22:32:14 +0000 |
| Subject: | cvs: pear-core / package-PEAR.xml package2.xml /PEAR Config.php | ||
| Groups: | php.pear.cvs php.pear.core | ||
| Request: | Send a blank email to pear-cvs+get-35748@lists.php.net to get a copy of this message | ||
cellog Thu Oct 20 18:32:14 2005 EDT
Modified files:
/pear-core/PEAR Config.php
/pear-core package-PEAR.xml package2.xml
Log:
* fix Bug #5676: pear config-create broken
http://cvs.php.net/diff.php/pear-core/PEAR/Config.php?r1=1.118&r2=1.119&ty=u
Index: pear-core/PEAR/Config.php
diff -u pear-core/PEAR/Config.php:1.118 pear-core/PEAR/Config.php:1.119
--- pear-core/PEAR/Config.php:1.118 Fri Sep 23 12:40:08 2005
+++ pear-core/PEAR/Config.php Thu Oct 20 18:32:12 2005
@@ -16,7 +16,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: Config.php,v 1.118 2005/09/23 16:40:08 cellog Exp $
+ * @version CVS: $Id: Config.php,v 1.119 2005/10/20 22:32:12 cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -544,7 +544,9 @@
$this->files['user'] = $user_file;
$this->files['system'] = $system_file;
if ($user_file && @file_exists($user_file)) {
+ $this->pushErrorHandling(PEAR_ERROR_RETURN);
$this->readConfigFile($user_file, 'user', $strict);
+ $this->popErrorHandling();
if ($this->_errorsFound > 0) {
return;
}
http://cvs.php.net/diff.php/pear-core/package-PEAR.xml?r1=1.290&r2=1.291&ty=u
Index: pear-core/package-PEAR.xml
diff -u pear-core/package-PEAR.xml:1.290 pear-core/package-PEAR.xml:1.291
--- pear-core/package-PEAR.xml:1.290 Thu Oct 20 18:13:47 2005
+++ pear-core/package-PEAR.xml Thu Oct 20 18:32:13 2005
@@ -82,6 +82,7 @@
quote situations properly
* fix Bug #5736: if registry can't lock registry or open filemap,
checkFileMap(), no error
+ * fix Bug #5676: pear config-create broken
</notes>
<provides type="class" name="OS_Guess"/>
<provides type="class" name="System"/>
http://cvs.php.net/diff.php/pear-core/package2.xml?r1=1.182&r2=1.183&ty=u
Index: pear-core/package2.xml
diff -u pear-core/package2.xml:1.182 pear-core/package2.xml:1.183
--- pear-core/package2.xml:1.182 Thu Oct 20 18:13:47 2005
+++ pear-core/package2.xml Thu Oct 20 18:32:14 2005
@@ -87,6 +87,7 @@
quote situations properly
* fix Bug #5736: if registry can't lock registry or open filemap,
checkFileMap(), no error
+ * fix Bug #5676: pear config-create broken
</notes>
<contents>
<dir name="/">