summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas V.V.Cox <cox@php.net>2003-06-16 07:44:46 +0000
committerTomas V.V.Cox <cox@php.net>2003-06-16 07:44:46 +0000
commitd335b38a375e293aa6e5ff2ee3556525026eac66 (patch)
tree96fbd9dce51fbc3a43112959a7ee0ca8298ed67c
parentb25c652f959204d77bb7ff5b044f671641738615 (diff)
downloadphp-git-d335b38a375e293aa6e5ff2ee3556525026eac66.tar.gz
Do not create the registry obj at Installer object creation
(it's problematic when pear install -R <DIR> is used)
-rw-r--r--pear/PEAR/Installer.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/pear/PEAR/Installer.php b/pear/PEAR/Installer.php
index 62238d8aee..4ac1d33620 100644
--- a/pear/PEAR/Installer.php
+++ b/pear/PEAR/Installer.php
@@ -117,7 +117,7 @@ class PEAR_Installer extends PEAR_Common
parent::PEAR_Common();
$this->setFrontendObject($ui);
$this->debug = $this->config->get('verbose');
- $this->registry = &new PEAR_Registry($this->config->get('php_dir'));
+ //$this->registry = &new PEAR_Registry($this->config->get('php_dir'));
}
// }}}
@@ -801,6 +801,9 @@ class PEAR_Installer extends PEAR_Common
*/
function checkDeps(&$pkginfo, &$errors)
{
+ if (empty($this->registry)) {
+ $this->registry = &new PEAR_Registry($this->config->get('php_dir'));
+ }
$depchecker = &new PEAR_Dependency($this->registry);
$error = $errors = '';
$failed_deps = $optional_deps = array();