From: Stig Bakken <ssb@php.net>
Date: Mon, 25 Nov 2002 23:52:56 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-4.3.0RC2~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ebf68f5f8cf792487707db66735f7d0f5efaac5;p=php

MFH
---

diff --git a/pear/PEAR/Command/Common.php b/pear/PEAR/Command/Common.php
index 16953d06b4..51305e233a 100644
--- a/pear/PEAR/Command/Common.php
+++ b/pear/PEAR/Command/Common.php
@@ -208,9 +208,9 @@ class PEAR_Command_Common extends PEAR
                 }
                 if (isset($v['shortopt'])) {
                     $s = $v['shortopt'];
-                    $help .= "  -$s$sapp, --$k$lapp\n";
+                    @$help .= "  -$s$sapp, --$k$lapp\n";
                 } else {
-                    $help .= "  --$k$lapp\n";
+                    @$help .= "  --$k$lapp\n";
                 }
                 $p = "        ";
                 $doc = rtrim(str_replace("\n", "\n$p", $v['doc']));
diff --git a/pear/PEAR/Command/Config.php b/pear/PEAR/Command/Config.php
index 85304fdcae..f204d415b0 100644
--- a/pear/PEAR/Command/Config.php
+++ b/pear/PEAR/Command/Config.php
@@ -46,7 +46,8 @@ configuration layers are "user", "system" and "default".
             'function' => 'doConfigGet',
             'shortcut' => 'cg',
             'options' => array(),
-            'doc' => 'Displays the value of one configuration parameter.  The
+            'doc' => '<parameter> [layer]
+Displays the value of one configuration parameter.  The
 first argument is the name of the parameter, an optional second argument
 may be used to tell which configuration layer to look in.  Valid configuration
 layers are "user", "system" and "default".  If no layer is specified, a value
@@ -59,12 +60,13 @@ just specified.
             'function' => 'doConfigSet',
             'shortcut' => 'cs',
             'options' => array(),
-            'doc' => 'Sets the value of one configuration parameter.  The first
-argument is the name of the parameter, the second argument is the new value.
-Some parameters are be subject to validation, and the command will fail with
-an error message if the new value does not make sense.  An optional third
-argument may be used to specify which layer to set the configuration parameter
-in.  The default layer is "user".
+            'doc' => '<parameter> <value> [layer]
+Sets the value of one configuration parameter.  The first argument is
+the name of the parameter, the second argument is the new value.  Some
+parameters are subject to validation, and the command will fail with
+an error message if the new value does not make sense.  An optional
+third argument may be used to specify in which layer to set the
+configuration parameter.  The default layer is "user".
 ',
             ),
         'config-help' => array(
@@ -198,4 +200,4 @@ displays help for all configuration parameters.
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/pear/PEAR/Command/Package.php b/pear/PEAR/Command/Package.php
index 49b0d92328..f82bff2c34 100644
--- a/pear/PEAR/Command/Package.php
+++ b/pear/PEAR/Command/Package.php
@@ -107,7 +107,7 @@ List all depencies the package has.'
 Signs a package distribution (.tar or .tgz) file with GnuPG.',
             ),
         'makerpm' => array(
-            'summary' => 'Builds an RPM package from a PEAR package',
+            'summary' => 'Builds an RPM spec file from a PEAR package',
             'function' => 'doMakeRPM',
             'shortcut' => 'rpm',
             'options' => array(
diff --git a/pear/PEAR/Command/Remote.php b/pear/PEAR/Command/Remote.php
index 0e6e94d11d..1af8902cf2 100644
--- a/pear/PEAR/Command/Remote.php
+++ b/pear/PEAR/Command/Remote.php
@@ -170,6 +170,9 @@ version of DB is 1.2, the downloaded file will be DB-1.2.tgz.',
         if (PEAR::isError($available)) {
             return $this->raiseError($available);
         }
+        if (!is_array($available)) {
+            return $this->raiseError('The package list could not be fetched from the remote server. Please try again. (Debug info: "'.$available.'")');
+        }
         $data = array(
             'caption' => 'All packages:',
             'border' => true,
diff --git a/pear/PEAR/Frontend/CLI.php b/pear/PEAR/Frontend/CLI.php
index 80a47507ca..f9a28b99dc 100644
--- a/pear/PEAR/Frontend/CLI.php
+++ b/pear/PEAR/Frontend/CLI.php
@@ -397,7 +397,7 @@ class PEAR_Frontend_CLI extends PEAR
                 break;
             case 'config-show':
                 $data['border'] = true;
-                $opts = array(0 => array('wrap' => 20),
+                $opts = array(0 => array('wrap' => 30),
                               1 => array('wrap' => 20),
                               2 => array('wrap' => 35));
                 $this->_startTable($data);
diff --git a/pear/PEAR/Remote.php b/pear/PEAR/Remote.php
index 0d1a11556c..d7b6e70e52 100644
--- a/pear/PEAR/Remote.php
+++ b/pear/PEAR/Remote.php
@@ -114,7 +114,9 @@ class PEAR_Remote extends PEAR
         
         if (extension_loaded("xmlrpc")) {
             $result = call_user_func_array(array(&$this, 'call_epi'), $args);
-            $this->saveCache($_args, $result);
+            if (!PEAR::isError($result)) {
+                $this->saveCache($_args, $result);
+            };
             return $result;
         }
         if (!@include_once("XML/RPC.php")) {