X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/8efa2a3ba4ae833415223a888e4561e57e4bf132..d2685fd634b32f152748b7004c6810e946bbbcf2:/apt-pkg/init.cc?ds=sidebyside

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 63e808118..29926b97a 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: init.cc,v 1.3 1998/07/16 06:08:36 jgg Exp $
+// $Id: init.cc,v 1.14 1998/11/25 23:54:06 jgg Exp $
 /* ######################################################################
 
    Init - Initialize the package library
@@ -9,6 +9,8 @@
 									/*}}}*/
 // Include files							/*{{{*/
 #include <apt-pkg/init.h>
+#include <apt-pkg/fileutl.h>
+#include <config.h>
 									/*}}}*/
 
 // pkgInitialize - Initialize the configuration class			/*{{{*/
@@ -19,25 +21,50 @@
 bool pkgInitialize(Configuration &Cnf)
 {
    // General APT things
-   Cnf.Set("APT::Architecture","i386");
+   Cnf.Set("APT::Architecture",ARCHITECTURE);
 
    // State
    Cnf.Set("Dir::State","/var/state/apt/");
    Cnf.Set("Dir::State::lists","lists/");
+   
+   /* These really should be jammed into a generic 'Local Database' engine
+      which is yet to be determined. The functions in pkgcachegen should
+      be the only users of these */
    Cnf.Set("Dir::State::xstatus","xstatus");
-   Cnf.Set("Dir::State::userstatus","status.user");
+   Cnf.Set("Dir::State::userstatus","status.user");   
+   Cnf.Set("Dir::State::status","/var/lib/dpkg/status");
+   Cnf.Set("Dir::State::cdroms","cdroms.list");
    
    // Cache
-   Cnf.Set("Dir::Cache","/etc/apt/");
+   Cnf.Set("Dir::Cache","/var/cache/apt/");
    Cnf.Set("Dir::Cache::archives","archives/");
-   Cnf.Set("Dir::Cache::srcpkgcache","srcpkgcache");
-   Cnf.Set("Dir::Cache::pkhcache","pkgcache");
+   Cnf.Set("Dir::Cache::srcpkgcache","srcpkgcache.bin");
+   Cnf.Set("Dir::Cache::pkgcache","pkgcache.bin");
    
    // Configuration
    Cnf.Set("Dir::Etc","/etc/apt/");
    Cnf.Set("Dir::Etc::sourcelist","sources.list");
    Cnf.Set("Dir::Etc::main","apt.conf");
+   Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
+   Cnf.Set("Dir::Bin::dpkg","/usr/bin/dpkg");
+   
+   // Read the main config file
+   string FName = Cnf.FindFile("Dir::Etc::main");
+   bool Res = true;
+   if (FileExists(FName) == true)
+      Res &= ReadConfigFile(Cnf,FName);
+   
+   // Read an alternate config file
+   const char *Cfg = getenv("APT_CONFIG");
+   if (Cfg != 0 && FileExists(Cfg) == true)
+      Res &= ReadConfigFile(Cnf,Cfg);
+   
+   if (Res == false)
+      return false;
    
+   if (Cnf.FindB("Debug::pkgInitialize",false) == true)
+      Cnf.Dump();
+      
    return true;
 }
 									/*}}}*/