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

cellog          Mon May 28 15:11:51 2007 UTC

  Modified files:              
    /pear-core  package2.xml package-PEAR.xml 
    /pear-core/PEAR     Downloader.php 
  Log:
    * fix Bug #10944: Cannot install Package+Subpackage [cipri]
  
  
http://cvs.php.net/viewvc.cgi/pear-core/package2.xml?r1=1.356&r2=1.357&diff_format=u
Index: pear-core/package2.xml
diff -u pear-core/package2.xml:1.356 pear-core/package2.xml:1.357
--- pear-core/package2.xml:1.356        Fri May 11 15:33:35 2007
+++ pear-core/package2.xml      Mon May 28 15:11:51 2007
@@ -96,6 +96,7 @@
   * fix Bug #10873: pear channel-discover broken - pear temp directories
     not writeable [cellog]
   * fix Bug #10938: Invalid package.xml creates wrong package [cellog]
+  * fix Bug #10944: Cannot install Package+Subpackage [cipri]
   * fix Bug #11014: custom tasks with "-" in name cannot be
     packaged [cellog]
   * implement Request #10373: if pref_state=stable and installed package=beta,
http://cvs.php.net/viewvc.cgi/pear-core/package-PEAR.xml?r1=1.458&r2=1.459&diff_format=u
Index: pear-core/package-PEAR.xml
diff -u pear-core/package-PEAR.xml:1.458 pear-core/package-PEAR.xml:1.459
--- pear-core/package-PEAR.xml:1.458    Fri May 11 15:33:35 2007
+++ pear-core/package-PEAR.xml  Mon May 28 15:11:51 2007
@@ -91,6 +91,7 @@
   * fix Bug #10873: pear channel-discover broken - pear temp directories
     not writeable [cellog]
   * fix Bug #10938: Invalid package.xml creates wrong package [cellog]
+  * fix Bug #10944: Cannot install Package+Subpackage [cipri]
   * fix Bug #11014: custom tasks with "-" in name cannot be
     packaged [cellog]
   * implement Request #10373: if pref_state=stable and installed package=beta,
http://cvs.php.net/viewvc.cgi/pear-core/PEAR/Downloader.php?r1=1.125&r2=1.126&diff_format=u
Index: pear-core/PEAR/Downloader.php
diff -u pear-core/PEAR/Downloader.php:1.125 pear-core/PEAR/Downloader.php:1.126
--- pear-core/PEAR/Downloader.php:1.125 Thu May 10 00:32:19 2007
+++ pear-core/PEAR/Downloader.php       Mon May 28 15:11:51 2007
@@ -18,7 +18,7 @@
  * @author     Martin Jansen <mj@xxxxxxx>
  * @copyright  1997-2006 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Downloader.php,v 1.125 2007/05/10 00:32:19 cellog Exp 
$
+ * @version    CVS: $Id: Downloader.php,v 1.126 2007/05/28 15:11:51 cellog Exp 
$
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.3.0
  */
@@ -361,6 +361,9 @@
             while ($reverify) {
                 $reverify = false;
                 foreach ($params as $i => $param) {
+                    //PHP Bug 40768 / PEAR Bug #10944
+                    //Nested foreaches fail in PHP 5.2.1
+                    key($params);
                     $ret = $params[$i]->detectDependencies($params);
                     if (PEAR::isError($ret)) {
                         $reverify = true;

-- 
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php