cvs: pear-core / package-PEAR.xml package2.xml /PEAR/PackageFile v2.php
[email protected] ("Greg Beaver")
| Newsgroups | php.pear.cvs,php.pear.core |
|---|---|
| Message-ID | <cvscellog1210656531@cvsserver> |
cellog Tue May 13 05:28:51 2008 UTC
Modified files:
/pear-core package2.xml package-PEAR.xml
/pear-core/PEAR/PackageFile v2.php
Log:
* Fix Bug #13508 undefined index errors when installing a remote bundle [cellog/tswicegood]
http://cvs.php.net/viewvc.cgi/pear-core/package2.xml?r1=1.427&r2=1.428&diff_format=u
Index: pear-core/package2.xml
diff -u pear-core/package2.xml:1.427 pear-core/package2.xml:1.428
--- pear-core/package2.xml:1.427 Tue May 13 01:32:17 2008
+++ pear-core/package2.xml Tue May 13 05:28:51 2008
@@ -107,6 +107,7 @@
* Fix Bug #13434 Breaks on HPUX - "find () -ls" doesn't work [cellog]
* Fix Bug #13484 pear package brings up warnings [dufuz]
* Fix Bug #13485 pear package-validate brings up ASCII issues [dufuz]
+ * Fix Bug #13508 undefined index errors when installing a remote bundle [cellog/tswicegood]
* Fix Bug #13525 pear package-validate is not showing warnings even if there are [dufuz]
</notes>
<contents>
http://cvs.php.net/viewvc.cgi/pear-core/package-PEAR.xml?r1=1.527&r2=1.528&diff_format=u
Index: pear-core/package-PEAR.xml
diff -u pear-core/package-PEAR.xml:1.527 pear-core/package-PEAR.xml:1.528
--- pear-core/package-PEAR.xml:1.527 Tue May 13 01:32:17 2008
+++ pear-core/package-PEAR.xml Tue May 13 05:28:51 2008
@@ -102,6 +102,7 @@
* Fix Bug #13434 Breaks on HPUX - "find () -ls" doesn't work [cellog]
* Fix Bug #13484 pear package brings up warnings [dufuz]
* Fix Bug #13485 pear package-validate brings up ASCII issues [dufuz]
+ * Fix Bug #13508 undefined index errors when installing a remote bundle [cellog/tswicegood]
* Fix Bug #13525 pear package-validate is not showing warnings even if there are [dufuz]
</notes>
<provides type="class" name="OS_Guess"/>
http://cvs.php.net/viewvc.cgi/pear-core/PEAR/PackageFile/v2.php?r1=1.142&r2=1.143&diff_format=u
Index: pear-core/PEAR/PackageFile/v2.php
diff -u pear-core/PEAR/PackageFile/v2.php:1.142 pear-core/PEAR/PackageFile/v2.php:1.143
--- pear-core/PEAR/PackageFile/v2.php:1.142 Fri Mar 28 19:35:43 2008
+++ pear-core/PEAR/PackageFile/v2.php Tue May 13 05:28:51 2008
@@ -15,7 +15,7 @@
* @author Greg Beaver <[email protected]>
* @copyright 1997-2008 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: v2.php,v 1.142 2008/03/28 19:35:43 dufuz Exp $
+ * @version CVS: $Id: v2.php,v 1.143 2008/05/13 05:28:51 cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -1172,6 +1172,9 @@
$this->flattenFilelist();
if ($contents = $this->getContents()) {
$ret = array();
+ if (!isset($contents['dir'])) {
+ return false;
+ }
if (!isset($contents['dir']['file'][0])) {
$contents['dir']['file'] = array($contents['dir']['file']);
}