[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pear-cvs
Subject:    [PEAR-CVS] cvs: pear-core /PEAR/Downloader Package.php
From:       "Helgi �ormar �orbj�rnsson" <dufuz () php ! net>
Date:       2009-01-31 19:08:30
Message-ID: cvsdufuz1233428910 () cvsserver
[Download RAW message or body]

dufuz		Sat Jan 31 19:08:30 2009 UTC

  Modified files:              
    /pear-core/PEAR/Downloader	Package.php 
  Log:
  Initial work for Request #10825: Only display the "invalid or missing package \
file"-error if it makes sense  Still package foo is not valid message is showing
  
  To see the initialize message then just pass -v as such pear -v install mdb2 
  
http://cvs.php.net/viewvc.cgi/pear-core/PEAR/Downloader/Package.php?r1=1.116&r2=1.117&diff_format=u
                
Index: pear-core/PEAR/Downloader/Package.php
diff -u pear-core/PEAR/Downloader/Package.php:1.116 \
                pear-core/PEAR/Downloader/Package.php:1.117
--- pear-core/PEAR/Downloader/Package.php:1.116	Sat Jan 31 16:50:35 2009
+++ pear-core/PEAR/Downloader/Package.php	Sat Jan 31 19:08:30 2009
@@ -15,7 +15,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2008 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Package.php,v 1.116 2009/01/31 16:50:35 dufuz Exp $
+ * @version    CVS: $Id: Package.php,v 1.117 2009/01/31 19:08:30 dufuz Exp $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -214,7 +214,12 @@
                         $param = $this->_registry->parsedPackageNameToString($param, \
true);  }
 
-                    return PEAR::raiseError("Cannot initialize '$param', invalid or \
missing package file"); +                    if (!isset($options['soft'])) {
+                        $this->_downloader->log(2, "Cannot initialize '$param', \
invalid or missing package file"); +                    }
+
+                    // Passing no message back - already logged above
+                    return PEAR::raiseError();
                 }
 
                 if (PEAR::isError($err) && !isset($options['soft'])) {
@@ -225,8 +230,12 @@
                     $param = $this->_registry->parsedPackageNameToString($param, \
true);  }
 
-                return PEAR::raiseError(
-                    "Cannot initialize '$param', invalid or missing package file");
+                if (!isset($options['soft'])) {
+                    $this->_downloader->log(2, "Cannot initialize '$param', invalid \
or missing package file"); +                }
+
+                // Passing no message back - already logged above
+                return PEAR::raiseError();
             }
         }
 



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


[prev in list] [next in list] [prev in thread] [next in thread]