cvs: pear-core /PEAR/PackageFile/v2 Validator.php

From: Date: Tue, 05 Apr 2005 22:33:13 +0000
Subject: cvs: pear-core /PEAR/PackageFile/v2 Validator.php
Groups: php.pear.cvs php.pear.core 
Request: Send a blank email to pear-cvs+get-30935@lists.php.net to get a copy of this message
cellog Tue Apr 5 18:33:13 2005 EDT Modified files: /pear-core/PEAR/PackageFile/v2 Validator.php Log: fix bug #4060: pear upgrade Auth_HTTP fails http://cvs.php.net/diff.php/pear-core/PEAR/PackageFile/v2/Validator.php?r1=1.60&r2=1.61&ty=u Index: pear-core/PEAR/PackageFile/v2/Validator.php diff -u pear-core/PEAR/PackageFile/v2/Validator.php:1.60 pear-core/PEAR/PackageFile/v2/Validator.php:1.61 --- pear-core/PEAR/PackageFile/v2/Validator.php:1.60 Thu Mar 17 21:37:21 2005 +++ pear-core/PEAR/PackageFile/v2/Validator.php Tue Apr 5 18:33:12 2005 @@ -17,7 +17,7 @@ // | | // +----------------------------------------------------------------------+ // -// $Id: Validator.php,v 1.60 2005/03/18 02:37:21 cellog Exp $ +// $Id: Validator.php,v 1.61 2005/04/05 22:33:12 cellog Exp $ /** * Private validation class used by PEAR_PackageFile_v2 - do not use directly, its * sole purpose is to split up the PEAR/PackageFile/v2.php file to make it smaller @@ -713,7 +713,13 @@ '*conflicts', ); $type = $installcondition ? '<installcondition><os>' : '<dependencies><required><os>'; - $this->_stupidSchemaValidate($structure, $dep, $type); + if ($this->_stupidSchemaValidate($structure, $dep, $type)) { + if ($dep['name'] == '*') { + if (array_key_exists('conflicts', $dep)) { + $this->_cannotConflictWithAllOs($type); + } + } + } } function _validateArchDep($dep, $installcondition = false) @@ -1554,6 +1560,12 @@ '<%tag%> must contain <%type%> defining the %type% to be used'); } + function _cannotConflictWithAllOs($type) + { + $this->_stack->push(__FUNCTION__, 'error', array('tag' => $tag), + '%tag% cannot conflict with all OSes'); + } + function _analyzeBundledPackages() { if (!$this->_isValid) {

« previous php.pear.cvs (#30935) next »