cvs: pear-core / package-PEAR.xml package2.xml /PEAR/PackageFile/v2 rw.php

cellog          Mon Oct 30 04:12:02 2006 UTC

  Modified files:              
    /pear-core/PEAR/PackageFile/v2      rw.php 
    /pear-core  package-PEAR.xml package2.xml 
  Log:
    * fix Bug #9182: can't add versioning to conflicting deps in PEAR_PF_v2_rw
  
http://cvs.php.net/viewvc.cgi/pear-core/PEAR/PackageFile/v2/rw.php?r1=1.18&r2=1.19&diff_format=u
Index: pear-core/PEAR/PackageFile/v2/rw.php
diff -u pear-core/PEAR/PackageFile/v2/rw.php:1.18 
pear-core/PEAR/PackageFile/v2/rw.php:1.19
--- pear-core/PEAR/PackageFile/v2/rw.php:1.18   Mon Sep 25 05:12:21 2006
+++ pear-core/PEAR/PackageFile/v2/rw.php        Mon Oct 30 04:12:02 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: rw.php,v 1.18 2006/09/25 05:12:21 cellog Exp $
+ * @version    CVS: $Id: rw.php,v 1.19 2006/10/30 04:12:02 cellog Exp $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a8
  */
@@ -786,19 +786,16 @@
      * @param string package name
      * @param string package channel
      * @param string extension this package provides, if any
+     * @param string|false minimum version required
+     * @param string|false maximum version allowed
+     * @param array|false versions to exclude from installation
      */
-    function addConflictingPackageDepWithChannel($name, $channel, 
$providesextension = false)
+    function addConflictingPackageDepWithChannel($name, $channel,
+                $providesextension = false, $min = false, $max = false, 
$exclude = false)
     {
         $this->_isValid = 0;
-        $dep =
-            array(
-                'name' => $name,
-                'channel' => $channel,
-                'conflicts' => '',
-            );
-        if ($providesextension) {
-            $dep['providesextension'] = $providesextension;
-        }
+        $dep = $this->_constructDep($name, $channel, false, $min, $max, false,
+            $exclude, $providesextension, false, true);
         $this->_packageInfo = $this->_mergeTag($this->_packageInfo, $dep,
             array(
                 'dependencies' => array('providesextension', 'usesrole', 
'usestask',
@@ -861,11 +858,13 @@
      * @param string extension this package provides, if any
      * @param bool if true, tells the installer to ignore the default optional 
dependency group
      *             when installing this package
+     * @param bool if true, tells the installer to negate this dependency 
(conflicts)
      * @return array
      * @access private
      */
     function _constructDep($name, $channel, $uri, $min, $max, $recommended, 
$exclude,
-                           $providesextension = false, $nodefault = false)
+                           $providesextension = false, $nodefault = false,
+                           $conflicts = false)
     {
         $dep =
             array(
@@ -891,6 +890,9 @@
             }
             $dep['exclude'] = $exclude;
         }
+        if ($conflicts) {
+            $dep['conflicts'] = '';
+        }
         if ($nodefault) {
             $dep['nodefault'] = '';
         }
http://cvs.php.net/viewvc.cgi/pear-core/package-PEAR.xml?r1=1.397&r2=1.398&diff_format=u
Index: pear-core/package-PEAR.xml
diff -u pear-core/package-PEAR.xml:1.397 pear-core/package-PEAR.xml:1.398
--- pear-core/package-PEAR.xml:1.397    Mon Oct 30 03:47:48 2006
+++ pear-core/package-PEAR.xml  Mon Oct 30 04:12:02 2006
@@ -89,6 +89,7 @@
   * fix Bug #9101: PEAR_Exception::getCauseMessage() failure with a
                    nested Exception (Adam Harvey)
   * fix Bug #9135: pear bundle fails if php_dir is not writeable
+  * fix Bug #9182: can't add versioning to conflicting deps in PEAR_PF_v2_rw
   * 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.293&r2=1.294&diff_format=u
Index: pear-core/package2.xml
diff -u pear-core/package2.xml:1.293 pear-core/package2.xml:1.294
--- pear-core/package2.xml:1.293        Mon Oct 30 03:47:48 2006
+++ pear-core/package2.xml      Mon Oct 30 04:12:02 2006
@@ -94,6 +94,7 @@
   * fix Bug #9101: PEAR_Exception::getCauseMessage() failure with a
                    nested Exception (Adam Harvey)
   * fix Bug #9135: pear bundle fails if php_dir is not writeable
+  * fix Bug #9182: can't add versioning to conflicting deps in PEAR_PF_v2_rw
   * implement Request #8827: add a yesno type handling for post-install scripts
  </notes>
  <contents>

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