cvs: pear-core / package-PEAR.xml package2.xml /PEAR DependencyDB.php Downloader.php /PEAR/Downloader Package.php
| From: | Greg Beaver | Date: | Thu, 25 May 2006 21:40:37 +0000 |
| Subject: | cvs: pear-core / package-PEAR.xml package2.xml /PEAR DependencyDB.php Downloader.php /PEAR/Downloader Package.php | ||
| Groups: | php.pear.cvs php.pear.core | ||
| Request: | Send a blank email to pear-core+get-4766@lists.php.net to get a copy of this message | ||
cellog Thu May 25 21:40:37 2006 UTC
Modified files:
/pear-core package-PEAR.xml package2.xml
/pear-core/PEAR DependencyDB.php Downloader.php
/pear-core/PEAR/Downloader Package.php
Log:
* fix Bug #7726: <uri> dependency is broken
http://cvs.php.net/viewcvs.cgi/pear-core/package-PEAR.xml?r1=1.370&r2=1.371&diff_format=u Index: pear-core/package-PEAR.xml diff -u pear-core/package-PEAR.xml:1.370 pear-core/package-PEAR.xml:1.371 --- pear-core/package-PEAR.xml:1.370 Fri May 12 02:38:59 2006 +++ pear-core/package-PEAR.xml Thu May 25 21:40:36 2006 @@ -98,6 +98,7 @@ and --packagingroot, fatal erro * fix Bug #7419: Check inputs in PEAR_PackageFile_v2_rw * fix Bug #7464: run-scripts causes notices + * fix Bug #7726: <uri> dependency is broken * implement Request #6396: add extension enabling in php.ini for 1.5.0 * implement Request #6614: use go-pear style dialogs in PEAR_Command_CLI by default * implement Request #6702: implement TAP output option for run-tests command http://cvs.php.net/viewcvs.cgi/pear-core/package2.xml?r1=1.264&r2=1.265&diff_format=u Index: pear-core/package2.xml diff -u pear-core/package2.xml:1.264 pear-core/package2.xml:1.265 --- pear-core/package2.xml:1.264 Fri May 12 02:38:59 2006 +++ pear-core/package2.xml Thu May 25 21:40:36 2006 @@ -103,6 +103,7 @@ and --packagingroot, fatal erro * fix Bug #7419: Check inputs in PEAR_PackageFile_v2_rw * fix Bug #7464: run-scripts causes notices + * fix Bug #7726: <uri> dependency is broken * implement Request #6396: add extension enabling in php.ini for 1.5.0 * implement Request #6614: use go-pear style dialogs in PEAR_Command_CLI by default * implement Request #6702: implement TAP output option for run-tests command http://cvs.php.net/viewcvs.cgi/pear-core/PEAR/DependencyDB.php?r1=1.32&r2=1.33&diff_format=u Index: pear-core/PEAR/DependencyDB.php diff -u pear-core/PEAR/DependencyDB.php:1.32 pear-core/PEAR/DependencyDB.php:1.33 --- pear-core/PEAR/DependencyDB.php:1.32 Sun Mar 26 23:33:27 2006 +++ pear-core/PEAR/DependencyDB.php Thu May 25 21:40:36 2006 @@ -16,7 +16,7 @@ * @author Greg Beaver <cellog@php.net> * @copyright 1997-2006 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: DependencyDB.php,v 1.32 2006/03/26 23:33:27 cellog Exp $ + * @version CVS: $Id: DependencyDB.php,v 1.33 2006/05/25 21:40:36 cellog Exp $ * @link http://pear.php.net/package/PEAR * @since File available since Release 1.4.0a1 */ @@ -290,16 +290,36 @@ return false; } foreach ($this->_cache['dependencies'][$channel][$package] as $info) { + if (isset($info['dep']['uri'])) { + if (is_object($child)) { + if ($info['dep']['uri'] == $child->getURI()) { + return true; + } + } elseif (isset($child['uri'])) { + if ($info['dep']['uri'] == $child['uri']) { + return true; + } + } + return false; + } if (strtolower($info['dep']['channel']) == strtolower($depchannel) && strtolower($info['dep']['name']) == strtolower($deppackage)) { return true; } } foreach ($this->_cache['dependencies'][$channel][$package] as $info) { - if ($this->_dependsOn(array( - 'channel' => $info['dep']['channel'], - 'package' => $info['dep']['name']), $child, $checked)) { - return true; + if (isset($info['dep']['uri'])) { + if ($this->_dependsOn(array( + 'uri' => $info['dep']['uri'], + 'package' => $info['dep']['name']), $child, $checked)) { + return true; + } + } else { + if ($this->_dependsOn(array( + 'channel' => $info['dep']['channel'], + 'package' => $info['dep']['name']), $child, $checked)) { + return true; + } } } return false; http://cvs.php.net/viewcvs.cgi/pear-core/PEAR/Downloader.php?r1=1.105&r2=1.106&diff_format=u Index: pear-core/PEAR/Downloader.php diff -u pear-core/PEAR/Downloader.php:1.105 pear-core/PEAR/Downloader.php:1.106 --- pear-core/PEAR/Downloader.php:1.105 Wed Mar 29 22:57:24 2006 +++ pear-core/PEAR/Downloader.php Thu May 25 21:40:36 2006 @@ -18,7 +18,7 @@ * @author Martin Jansen <mj@php.net> * @copyright 1997-2006 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: Downloader.php,v 1.105 2006/03/29 22:57:24 cellog Exp $ + * @version CVS: $Id: Downloader.php,v 1.106 2006/05/25 21:40:36 cellog Exp $ * @link http://pear.php.net/package/PEAR * @since File available since Release 1.3.0 */ @@ -862,33 +862,62 @@ { $xsdversion = isset($dep['rel']) ? '1.0' : '2.0'; $curchannel = $this->config->get('default_channel'); - if (isset($dep['channel'])) { - $remotechannel = $dep['channel']; + if (isset($dep['uri'])) { + $xsdversion = '2.0'; + $chan = &$this->_registry->getChannel('__uri'); + if (PEAR::isError($chan)) { + return $chan; + } + $version = $this->_registry->packageInfo($dep['name'], 'version', '__uri'); + $this->configSet('default_channel', '__uri'); } else { - $remotechannel = 'pear.php.net'; - } - if (!$this->_registry->channelExists($remotechannel)) { - do { - if ($this->config->get('auto_discover')) { - if ($this->discover($remotechannel)) { - break; + if (isset($dep['channel'])) { + $remotechannel = $dep['channel']; + } else { + $remotechannel = 'pear.php.net'; + } + if (!$this->_registry->channelExists($remotechannel)) { + do { + if ($this->config->get('auto_discover')) { + if ($this->discover($remotechannel)) { + break; + } } - } - return PEAR::raiseError('Unknown remote channel: ' . $remotechannel); - } while (false); + return PEAR::raiseError('Unknown remote channel: ' . $remotechannel); + } while (false); + } + $chan = &$this->_registry->getChannel($remotechannel); + if (PEAR::isError($chan)) { + return $chan; + } + $version = $this->_registry->packageInfo($dep['name'], 'version', + $remotechannel); + $this->configSet('default_channel', $remotechannel); } - $this->configSet('default_channel', $remotechannel); $state = isset($parr['state']) ? $parr['state'] : $this->config->get('preferred_state'); if (isset($parr['state']) && isset($parr['version'])) { unset($parr['state']); } - $chan = &$this->_registry->getChannel($remotechannel); - if (PEAR::isError($chan)) { - return $chan; - } - $version = $this->_registry->packageInfo($dep['name'], 'version', - $remotechannel); - if ($chan->supportsREST($this->config->get('preferred_mirror')) && + if (isset($dep['uri'])) { + $info = &$this->newDownloaderPackage($this); + PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN); + $err = $info->initialize($dep); + PEAR::staticPopErrorHandling(); + if (!$err) { + // skip parameters that were missed by preferred_state + return PEAR::raiseError('Cannot initialize dependency'); + } + if (PEAR::isError($err)) { + if (!isset($this->_options['soft'])) { + $this->log(0, $err->getMessage()); + } + if (is_object($info)) { + $param = $info->getChannel() . '/' . $info->getPackage(); + } + return PEAR::raiseError('Package "' . $param . '" is not valid'); + } + return $info; + } elseif ($chan->supportsREST($this->config->get('preferred_mirror')) && $base = $chan->getBaseURL('REST1.0', $this->config->get('preferred_mirror'))) { $rest = &$this->config->getREST('1.0', $this->_options); $url = $rest->getDepDownloadURL($base, $xsdversion, $dep, $parr, @@ -945,7 +974,7 @@ } else { $url = $this->_remote->call('package.getDepDownloadURL', $xsdversion, $dep, $parr, $state); } - if ($parr['channel'] != $curchannel) { + if ($this->config->get('default_channel') != $curchannel) { $this->configSet('default_channel', $curchannel); } if (!is_array($url)) { http://cvs.php.net/viewcvs.cgi/pear-core/PEAR/Downloader/Package.php?r1=1.97&r2=1.98&diff_format=u Index: pear-core/PEAR/Downloader/Package.php diff -u pear-core/PEAR/Downloader/Package.php:1.97 pear-core/PEAR/Downloader/Package.php:1.98 --- pear-core/PEAR/Downloader/Package.php:1.97 Mon Apr 3 01:07:19 2006 +++ pear-core/PEAR/Downloader/Package.php Thu May 25 21:40:37 2006 @@ -15,7 +15,7 @@ * @author Greg Beaver <cellog@php.net> * @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.97 2006/04/03 01:07:19 cellog Exp $ + * @version CVS: $Id: Package.php,v 1.98 2006/05/25 21:40:37 cellog Exp $ * @link http://pear.php.net/package/PEAR * @since File available since Release 1.4.0a1 */ @@ -1016,8 +1016,10 @@ } } else { if (isset($param['uri'])) { - $param['channel'] = '__uri'; - $param['package'] = $param['dep']['name']; + if ($this->getChannel() != '__uri') { + return false; + } + return $param['uri'] == $this->getURI(); } $package = isset($param['package']) ? $param['package'] : $param['info']->getPackage();
http://cvs.php.net/viewcvs.cgi/pear-core/package-PEAR.xml?r1=1.370&r2=1.371&diff_format=u Index: pear-core/package-PEAR.xml diff -u pear-core/package-PEAR.xml:1.370 pear-core/package-PEAR.xml:1.371 --- pear-core/package-PEAR.xml:1.370 Fri May 12 02:38:59 2006 +++ pear-core/package-PEAR.xml Thu May 25 21:40:36 2006 @@ -98,6 +98,7 @@ and --packagingroot, fatal erro * fix Bug #7419: Check inputs in PEAR_PackageFile_v2_rw * fix Bug #7464: run-scripts causes notices + * fix Bug #7726: <uri> dependency is broken * implement Request #6396: add extension enabling in php.ini for 1.5.0 * implement Request #6614: use go-pear style dialogs in PEAR_Command_CLI by default * implement Request #6702: implement TAP output option for run-tests command http://cvs.php.net/viewcvs.cgi/pear-core/package2.xml?r1=1.264&r2=1.265&diff_format=u Index: pear-core/package2.xml diff -u pear-core/package2.xml:1.264 pear-core/package2.xml:1.265 --- pear-core/package2.xml:1.264 Fri May 12 02:38:59 2006 +++ pear-core/package2.xml Thu May 25 21:40:36 2006 @@ -103,6 +103,7 @@ and --packagingroot, fatal erro * fix Bug #7419: Check inputs in PEAR_PackageFile_v2_rw * fix Bug #7464: run-scripts causes notices + * fix Bug #7726: <uri> dependency is broken * implement Request #6396: add extension enabling in php.ini for 1.5.0 * implement Request #6614: use go-pear style dialogs in PEAR_Command_CLI by default * implement Request #6702: implement TAP output option for run-tests command http://cvs.php.net/viewcvs.cgi/pear-core/PEAR/DependencyDB.php?r1=1.32&r2=1.33&diff_format=u Index: pear-core/PEAR/DependencyDB.php diff -u pear-core/PEAR/DependencyDB.php:1.32 pear-core/PEAR/DependencyDB.php:1.33 --- pear-core/PEAR/DependencyDB.php:1.32 Sun Mar 26 23:33:27 2006 +++ pear-core/PEAR/DependencyDB.php Thu May 25 21:40:36 2006 @@ -16,7 +16,7 @@ * @author Greg Beaver <cellog@php.net> * @copyright 1997-2006 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: DependencyDB.php,v 1.32 2006/03/26 23:33:27 cellog Exp $ + * @version CVS: $Id: DependencyDB.php,v 1.33 2006/05/25 21:40:36 cellog Exp $ * @link http://pear.php.net/package/PEAR * @since File available since Release 1.4.0a1 */ @@ -290,16 +290,36 @@ return false; } foreach ($this->_cache['dependencies'][$channel][$package] as $info) { + if (isset($info['dep']['uri'])) { + if (is_object($child)) { + if ($info['dep']['uri'] == $child->getURI()) { + return true; + } + } elseif (isset($child['uri'])) { + if ($info['dep']['uri'] == $child['uri']) { + return true; + } + } + return false; + } if (strtolower($info['dep']['channel']) == strtolower($depchannel) && strtolower($info['dep']['name']) == strtolower($deppackage)) { return true; } } foreach ($this->_cache['dependencies'][$channel][$package] as $info) { - if ($this->_dependsOn(array( - 'channel' => $info['dep']['channel'], - 'package' => $info['dep']['name']), $child, $checked)) { - return true; + if (isset($info['dep']['uri'])) { + if ($this->_dependsOn(array( + 'uri' => $info['dep']['uri'], + 'package' => $info['dep']['name']), $child, $checked)) { + return true; + } + } else { + if ($this->_dependsOn(array( + 'channel' => $info['dep']['channel'], + 'package' => $info['dep']['name']), $child, $checked)) { + return true; + } } } return false; http://cvs.php.net/viewcvs.cgi/pear-core/PEAR/Downloader.php?r1=1.105&r2=1.106&diff_format=u Index: pear-core/PEAR/Downloader.php diff -u pear-core/PEAR/Downloader.php:1.105 pear-core/PEAR/Downloader.php:1.106 --- pear-core/PEAR/Downloader.php:1.105 Wed Mar 29 22:57:24 2006 +++ pear-core/PEAR/Downloader.php Thu May 25 21:40:36 2006 @@ -18,7 +18,7 @@ * @author Martin Jansen <mj@php.net> * @copyright 1997-2006 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: Downloader.php,v 1.105 2006/03/29 22:57:24 cellog Exp $ + * @version CVS: $Id: Downloader.php,v 1.106 2006/05/25 21:40:36 cellog Exp $ * @link http://pear.php.net/package/PEAR * @since File available since Release 1.3.0 */ @@ -862,33 +862,62 @@ { $xsdversion = isset($dep['rel']) ? '1.0' : '2.0'; $curchannel = $this->config->get('default_channel'); - if (isset($dep['channel'])) { - $remotechannel = $dep['channel']; + if (isset($dep['uri'])) { + $xsdversion = '2.0'; + $chan = &$this->_registry->getChannel('__uri'); + if (PEAR::isError($chan)) { + return $chan; + } + $version = $this->_registry->packageInfo($dep['name'], 'version', '__uri'); + $this->configSet('default_channel', '__uri'); } else { - $remotechannel = 'pear.php.net'; - } - if (!$this->_registry->channelExists($remotechannel)) { - do { - if ($this->config->get('auto_discover')) { - if ($this->discover($remotechannel)) { - break; + if (isset($dep['channel'])) { + $remotechannel = $dep['channel']; + } else { + $remotechannel = 'pear.php.net'; + } + if (!$this->_registry->channelExists($remotechannel)) { + do { + if ($this->config->get('auto_discover')) { + if ($this->discover($remotechannel)) { + break; + } } - } - return PEAR::raiseError('Unknown remote channel: ' . $remotechannel); - } while (false); + return PEAR::raiseError('Unknown remote channel: ' . $remotechannel); + } while (false); + } + $chan = &$this->_registry->getChannel($remotechannel); + if (PEAR::isError($chan)) { + return $chan; + } + $version = $this->_registry->packageInfo($dep['name'], 'version', + $remotechannel); + $this->configSet('default_channel', $remotechannel); } - $this->configSet('default_channel', $remotechannel); $state = isset($parr['state']) ? $parr['state'] : $this->config->get('preferred_state'); if (isset($parr['state']) && isset($parr['version'])) { unset($parr['state']); } - $chan = &$this->_registry->getChannel($remotechannel); - if (PEAR::isError($chan)) { - return $chan; - } - $version = $this->_registry->packageInfo($dep['name'], 'version', - $remotechannel); - if ($chan->supportsREST($this->config->get('preferred_mirror')) && + if (isset($dep['uri'])) { + $info = &$this->newDownloaderPackage($this); + PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN); + $err = $info->initialize($dep); + PEAR::staticPopErrorHandling(); + if (!$err) { + // skip parameters that were missed by preferred_state + return PEAR::raiseError('Cannot initialize dependency'); + } + if (PEAR::isError($err)) { + if (!isset($this->_options['soft'])) { + $this->log(0, $err->getMessage()); + } + if (is_object($info)) { + $param = $info->getChannel() . '/' . $info->getPackage(); + } + return PEAR::raiseError('Package "' . $param . '" is not valid'); + } + return $info; + } elseif ($chan->supportsREST($this->config->get('preferred_mirror')) && $base = $chan->getBaseURL('REST1.0', $this->config->get('preferred_mirror'))) { $rest = &$this->config->getREST('1.0', $this->_options); $url = $rest->getDepDownloadURL($base, $xsdversion, $dep, $parr, @@ -945,7 +974,7 @@ } else { $url = $this->_remote->call('package.getDepDownloadURL', $xsdversion, $dep, $parr, $state); } - if ($parr['channel'] != $curchannel) { + if ($this->config->get('default_channel') != $curchannel) { $this->configSet('default_channel', $curchannel); } if (!is_array($url)) { http://cvs.php.net/viewcvs.cgi/pear-core/PEAR/Downloader/Package.php?r1=1.97&r2=1.98&diff_format=u Index: pear-core/PEAR/Downloader/Package.php diff -u pear-core/PEAR/Downloader/Package.php:1.97 pear-core/PEAR/Downloader/Package.php:1.98 --- pear-core/PEAR/Downloader/Package.php:1.97 Mon Apr 3 01:07:19 2006 +++ pear-core/PEAR/Downloader/Package.php Thu May 25 21:40:37 2006 @@ -15,7 +15,7 @@ * @author Greg Beaver <cellog@php.net> * @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.97 2006/04/03 01:07:19 cellog Exp $ + * @version CVS: $Id: Package.php,v 1.98 2006/05/25 21:40:37 cellog Exp $ * @link http://pear.php.net/package/PEAR * @since File available since Release 1.4.0a1 */ @@ -1016,8 +1016,10 @@ } } else { if (isset($param['uri'])) { - $param['channel'] = '__uri'; - $param['package'] = $param['dep']['name']; + if ($this->getChannel() != '__uri') { + return false; + } + return $param['uri'] == $this->getURI(); } $package = isset($param['package']) ? $param['package'] : $param['info']->getPackage();