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

cellog          Thu Oct 12 21:23:59 2006 UTC

  Modified files:              
    /pear-core  package-PEAR.xml package2.xml 
    /pear-core/PEAR/Downloader  Package.php 
  Log:
    * fix Bug #8794: upgrade-all including Auth fails with fatal error
  
  
http://cvs.php.net/viewvc.cgi/pear-core/package-PEAR.xml?r1=1.393&r2=1.394&diff_format=u
Index: pear-core/package-PEAR.xml
diff -u pear-core/package-PEAR.xml:1.393 pear-core/package-PEAR.xml:1.394
--- pear-core/package-PEAR.xml:1.393    Sun Oct  1 22:29:14 2006
+++ pear-core/package-PEAR.xml  Thu Oct 12 21:23:59 2006
@@ -84,6 +84,7 @@
   <state>alpha</state>
   <notes>
   Minor feature addition
+  * fix Bug #8794: upgrade-all including Auth fails with fatal error
   * implement Request #8827: add a yesno type handling for post-install scripts
   </notes>
   <provides type="class" name="OS_Guess"/>
http://cvs.php.net/viewvc.cgi/pear-core/package2.xml?r1=1.289&r2=1.290&diff_format=u
Index: pear-core/package2.xml
diff -u pear-core/package2.xml:1.289 pear-core/package2.xml:1.290
--- pear-core/package2.xml:1.289        Sun Oct  1 22:29:14 2006
+++ pear-core/package2.xml      Thu Oct 12 21:23:59 2006
@@ -89,6 +89,7 @@
  <license uri="http://www.php.net/license";>PHP License</license>
  <notes>
   Minor feature addition
+  * fix Bug #8794: upgrade-all including Auth fails with fatal error
   * implement Request #8827: add a yesno type handling for post-install scripts
  </notes>
  <contents>
http://cvs.php.net/viewvc.cgi/pear-core/PEAR/Downloader/Package.php?r1=1.102&r2=1.103&diff_format=u
Index: pear-core/PEAR/Downloader/Package.php
diff -u pear-core/PEAR/Downloader/Package.php:1.102 
pear-core/PEAR/Downloader/Package.php:1.103
--- pear-core/PEAR/Downloader/Package.php:1.102 Mon Sep 25 05:27:23 2006
+++ pear-core/PEAR/Downloader/Package.php       Thu Oct 12 21:23:59 2006
@@ -15,7 +15,7 @@
  * @author     Greg Beaver <cellog@xxxxxxx>
  * @copyright  1997-2006 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Package.php,v 1.102 2006/09/25 05:27:23 cellog Exp $
+ * @version    CVS: $Id: Package.php,v 1.103 2006/10/12 21:23:59 cellog Exp $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -966,7 +966,11 @@
         if (isset($this->_packagefile)) {
             return $this->_packagefile->isExtension($name);
         } elseif (isset($this->_downloadURL['info'])) {
-            return $this->_downloadURL['info']->getProvidesExtension() == 
$name;
+                       if ($this->_downloadURL['info']->getPackagexmlVersion() 
== '2.0') {
+                               return 
$this->_downloadURL['info']->getProvidesExtension() == $name;
+                       } else {
+                               return false;
+                       }
         } else {
             return false;
         }