cellog Thu May 12 17:35:01 2005 EDT
Modified files:
/pear-core/PEAR/Downloader Package.php
Log:
potential fix for Bug #4285
allow recycling of dependencies if a bad package was
found
http://cvs.php.net/diff.php/pear-core/PEAR/Downloader/Package.php?r1=1.70&r2=1.71&ty=u
Index: pear-core/PEAR/Downloader/Package.php
diff -u pear-core/PEAR/Downloader/Package.php:1.70
pear-core/PEAR/Downloader/Package.php:1.71
--- pear-core/PEAR/Downloader/Package.php:1.70 Wed May 11 23:28:55 2005
+++ pear-core/PEAR/Downloader/Package.php Thu May 12 17:35:00 2005
@@ -15,7 +15,7 @@
* @author Greg Beaver <cellog@xxxxxxx>
* @copyright 1997-2005 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: Package.php,v 1.70 2005/05/12 03:28:55 cellog Exp $
+ * @version CVS: $Id: Package.php,v 1.71 2005/05/12 21:35:00 cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -370,6 +370,7 @@
function _detect2($deps, $pname, $options, $params)
{
+ $this->_downloadDeps = array();
foreach (array('package', 'subpackage') as $packagetype) {
// get required dependency group
if (isset($deps['required'][$packagetype])) {
@@ -572,6 +573,7 @@
function _detect1($deps, $pname, $options, $params)
{
+ $this->_downloadDeps = array();
$skipnames = array();
foreach ($deps as $dep) {
$nodownload = false;
|