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

cellog Thu Feb 9 22:39:33 2006 UTC Modified files: /pear-core/PEAR PackageFile.php /pear-core package-PEAR.xml package2.xml Log: * fix Bug #6735: PEAR_PackageFile::fromTgzFile doesn't work with package.xml not in root dir http://cvs.php.net/viewcvs.cgi/pear-core/PEAR/PackageFile.php?r1=1.32&r2=1.33&diff_format=u Index: pear-core/PEAR/PackageFile.php diff -u pear-core/PEAR/PackageFile.php:1.32 pear-core/PEAR/PackageFile.php:1.33 --- pear-core/PEAR/PackageFile.php:1.32 Fri Jan 6 04:47:36 2006 +++ pear-core/PEAR/PackageFile.php Thu Feb 9 22:39:32 2006 @@ -15,7 +15,7 @@ * @author Greg Beaver <cellog@php.net> * @copyright 1997-2006 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: PackageFile.php,v 1.32 2006/01/06 04:47:36 cellog Exp $ + * @version CVS: $Id: PackageFile.php,v 1.33 2006/02/09 22:39:32 cellog Exp $ * @link http://pear.php.net/package/PEAR * @since File available since Release 1.4.0a1 */ @@ -332,7 +332,7 @@ $xml = $name; break; } elseif (ereg('package.xml$', $name, $match)) { - $xml = $match[0]; + $xml = $name; break; } } http://cvs.php.net/viewcvs.cgi/pear-core/package-PEAR.xml?r1=1.346&r2=1.347&diff_format=u Index: pear-core/package-PEAR.xml diff -u pear-core/package-PEAR.xml:1.346 pear-core/package-PEAR.xml:1.347 --- pear-core/package-PEAR.xml:1.346 Thu Feb 9 00:41:28 2006 +++ pear-core/package-PEAR.xml Thu Feb 9 22:39:33 2006 @@ -108,6 +108,8 @@ * fix Bug #6692: Optional feature install message needs channel name * fix Bug #6716: &quot;pear install -r&quot; errors after install when attempting &quot;pear list &lt;pkgname&gt;&quot; + * fix Bug #6735: PEAR_PackageFile::fromTgzFile doesn't work with package.xml + not in root dir </notes> <provides type="class" name="OS_Guess"/> <provides type="class" name="System"/> http://cvs.php.net/viewcvs.cgi/pear-core/package2.xml?r1=1.240&r2=1.241&diff_format=u Index: pear-core/package2.xml diff -u pear-core/package2.xml:1.240 pear-core/package2.xml:1.241 --- pear-core/package2.xml:1.240 Thu Feb 9 01:46:01 2006 +++ pear-core/package2.xml Thu Feb 9 22:39:33 2006 @@ -113,6 +113,8 @@ * fix Bug #6692: Optional feature install message needs channel name * fix Bug #6716: &quot;pear install -r&quot; errors after install when attempting &quot;pear list &lt;pkgname&gt;&quot; + * fix Bug #6735: PEAR_PackageFile::fromTgzFile doesn't work with package.xml + not in root dir </notes> <contents> <dir name="/">