fix included files and put error messages in PEAR_Downloader where they are needed

diff --git a/pear/PEAR/Downloader.php b/pear/PEAR/Downloader.php
index 56182d2b667f8c067b19908f68625af249d5ee01..abb1a89d453889a88265cb9e7e6fc733e72c079a 100644 (file)
--- 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 f998d4c7517adf811e198042198a613f0af2cdbf..0963dbd1f7feeb612d71ee8f6493dbe32d271633 100644 (file)
--- 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