cvs: pear-core /PEAR/Command Remote.php /PEAR/REST 10.php

cellog          Mon Apr 25 01:20:17 2005 EDT

  Modified files:              
    /pear-core/PEAR/Command     Remote.php 
    /pear-core/PEAR/REST        10.php 
  Log:
  minor bugfixes to REST listAll
  
http://cvs.php.net/diff.php/pear-core/PEAR/Command/Remote.php?r1=1.74&r2=1.75&ty=u
Index: pear-core/PEAR/Command/Remote.php
diff -u pear-core/PEAR/Command/Remote.php:1.74 
pear-core/PEAR/Command/Remote.php:1.75
--- pear-core/PEAR/Command/Remote.php:1.74      Mon Apr 25 00:43:10 2005
+++ pear-core/PEAR/Command/Remote.php   Mon Apr 25 01:20:16 2005
@@ -17,7 +17,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: Remote.php,v 1.74 2005/04/25 04:43:10 cellog Exp $
+ * @version    CVS: $Id: Remote.php,v 1.75 2005/04/25 05:20:16 cellog Exp $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -288,10 +288,6 @@
         }
         if (PEAR::isError($available)) {
             $this->config->set('default_channel', $savechannel);
-            return $this->raiseError($available);
-        }
-        if (PEAR::isError($available)) {
-            $this->config->set('default_channel', $savechannel);
             return $this->raiseError('The package list could not be fetched 
from the remote server. Please try again. (Debug info: "' . 
$available->getMessage() . '")');
         }
         $data = array(
http://cvs.php.net/diff.php/pear-core/PEAR/REST/10.php?r1=1.6&r2=1.7&ty=u
Index: pear-core/PEAR/REST/10.php
diff -u pear-core/PEAR/REST/10.php:1.6 pear-core/PEAR/REST/10.php:1.7
--- pear-core/PEAR/REST/10.php:1.6      Mon Apr 25 00:43:10 2005
+++ pear-core/PEAR/REST/10.php  Mon Apr 25 01:20:16 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: 10.php,v 1.6 2005/04/25 04:43:10 cellog Exp $
+ * @version    CVS: $Id: 10.php,v 1.7 2005/04/25 05:20:16 cellog Exp $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a12
  */
@@ -275,13 +275,15 @@
                 if (PEAR::isError($inf)) {
                     return $inf;
                 }
-                $found = (!empty($searchpackage) && stristr($package, 
$searchpackage) !== false);
-                if (!$found && !(isset($searchsummary) && 
!empty($searchsummary)
-                    && (stristr($inf['s'], $searchsummary) !== false
-                        || stristr($info['d'], $searchsummary) !== false)))
-                {
-                    continue;
-                };
+                if ($searchpackage) {
+                    $found = (!empty($searchpackage) && stristr($package, 
$searchpackage) !== false);
+                    if (!$found && !(isset($searchsummary) && 
!empty($searchsummary)
+                        && (stristr($inf['s'], $searchsummary) !== false
+                            || stristr($info['d'], $searchsummary) !== false)))
+                    {
+                        continue;
+                    };
+                }
                 PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
                 if ($stable) {
                     $latest = $this->_rest->retrieveData($base . 'r/' . 
strtolower($package) .
@@ -294,12 +296,17 @@
                 }
                 PEAR::popErrorHandling();
                 $deps = array();
+                if (PEAR::isError($unstable)) {
+                    $unstable = false;
+                    $state = 'stable';
+                } else {
+                    $releaseinf = $this->_rest->retrieveData($base . 'r/' . 
strtolower($package) .
+                        '/' . $unstable . '.xml');
+                }
                 if (PEAR::isError($latest)) {
                     $latest = false;
                     $state = 'stable';
                 } else {
-                    $releaseinf = $this->_rest->retrieveData($base . 'r/' . 
strtolower($package) .
-                        '/' . $latest . '.xml');
                     $state = $releaseinf['st'];
                     $d = $this->_rest->retrieveData($base . 'r/' . 
strtolower($package) . '/deps.' .
                         $latest . '.txt');