summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Beaver <cellog@php.net>2004-04-30 16:37:41 +0000
committerGreg Beaver <cellog@php.net>2004-04-30 16:37:41 +0000
commita750e94013686b75f87038a5f160185606ebd5c3 (patch)
tree59f7020c7f84576b14897996b8f19ba03df8c47d
parentbbf5e08fa3bbeb21f77b93f534ab31e7e68e288d (diff)
downloadphp-git-a750e94013686b75f87038a5f160185606ebd5c3.tar.gz
MFH fix included files and put error messages in PEAR_Downloader where they are needed
-rw-r--r--pear/PEAR/Downloader.php6
-rw-r--r--pear/PEAR/Installer.php9
2 files changed, 6 insertions, 9 deletions
diff --git a/pear/PEAR/Downloader.php b/pear/PEAR/Downloader.php
index 676e3805a0..2b3a434dd2 100644
--- a/pear/PEAR/Downloader.php
+++ b/pear/PEAR/Downloader.php
@@ -26,6 +26,12 @@ require_once 'PEAR/Dependency.php';
require_once 'PEAR/Remote.php';
require_once 'System.php';
+
+define('PEAR_INSTALLER_OK', 1);
+define('PEAR_INSTALLER_FAILED', 0);
+define('PEAR_INSTALLER_SKIPPED', -1);
+define('PEAR_INSTALLER_ERROR_NO_PREF_STATE', 2);
+
/**
* Administration class used to download PEAR packages and maintain the
* installed package database.
diff --git a/pear/PEAR/Installer.php b/pear/PEAR/Installer.php
index be9339eea1..83b78ab719 100644
--- a/pear/PEAR/Installer.php
+++ b/pear/PEAR/Installer.php
@@ -20,16 +20,7 @@
//
// $Id$
-require_once 'PEAR/Common.php';
-require_once 'PEAR/Registry.php';
-require_once 'PEAR/Dependency.php';
require_once 'PEAR/Downloader.php';
-require_once 'System.php';
-
-define('PEAR_INSTALLER_OK', 1);
-define('PEAR_INSTALLER_FAILED', 0);
-define('PEAR_INSTALLER_SKIPPED', -1);
-define('PEAR_INSTALLER_ERROR_NO_PREF_STATE', 2);
/**
* Administration class used to install PEAR packages and maintain the