archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 01:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make the dependencies check look for the correct registry file

Browse source
This commit is contained in:
Tomas V.V.Cox 2002-04-09 14:12:12 +00:00
parent eb85e073e5
commit 4c125afc74
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pear/PEAR/Dependency.php
View file

@ -29,7 +29,10 @@ require_once "PEAR.php";
class PEAR_Dependency class PEAR_Dependency
{ {
function PEAR_Dependency(&$registry)
{
$this->registry = &$registry;
}
/** /**
* This method maps the xml dependency definition to the * This method maps the xml dependency definition to the
* PEAR_dependecy one * PEAR_dependecy one
@ -87,9 +90,6 @@ class PEAR_Dependency
*/ */
function checkPackage($name, $req = null, $relation = 'has') function checkPackage($name, $req = null, $relation = 'has')
{ {
if (empty($this->registry)) {
$this->registry = new PEAR_Registry;
}
if (!$this->registry->packageExists($name)) { if (!$this->registry->packageExists($name)) {
return "'$name' PEAR package is not installed"; return "'$name' PEAR package is not installed";
} }

4
pear/PEAR/Installer.php
View file

@ -238,7 +238,7 @@ class PEAR_Installer extends PEAR_Common
// - soft : fail silently // - soft : fail silently
// //
if (empty($this->registry)) { if (empty($this->registry)) {
$this->registry = new PEAR_Registry($this->config->get('php_dir')); $this->registry = &new PEAR_Registry($this->config->get('php_dir'));
} }
$oldcwd = getcwd(); $oldcwd = getcwd();
$need_download = false; $need_download = false;
@ -453,7 +453,7 @@ class PEAR_Installer extends PEAR_Common
function checkDeps(&$pkginfo) function checkDeps(&$pkginfo)
{ {
$deps = new PEAR_Dependency; $deps = &new PEAR_Dependency($this->registry);
$errors = null; $errors = null;
if (is_array($pkginfo['release_deps'])) { if (is_array($pkginfo['release_deps'])) {
foreach($pkginfo['release_deps'] as $dep) { foreach($pkginfo['release_deps'] as $dep) {