Minor fixes

[apt.git] / apt-pkg / init.cc

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 5dd7b58aa81b0a35e7ab80d8c58c0f9bc4e94e36..29926b97a5a36766878561f0b365ec58402d9d5f 100644 (file)
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: init.cc,v 1.1 1998/07/09 05:12:27 jgg Exp $
+// $Id: init.cc,v 1.14 1998/11/25 23:54:06 jgg Exp $

 /* ######################################################################
 
    Init - Initialize the package library
 /* ######################################################################
 
    Init - Initialize the package library


@@ -8,36 +8,63 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include files                                                       /*{{{*/

-#include <pkglib/init.h>
+#include <apt-pkg/init.h>
+#include <apt-pkg/fileutl.h>
+#include <config.h>

                                                                        /*}}}*/
 
                                                                        /*}}}*/
 

-// pkglibInitialize - Initialize the configuration class               /*{{{*/
+// pkgInitialize - Initialize the configuration class                  /*{{{*/

 // ---------------------------------------------------------------------
 /* Directories are specified in such a way that the FindDir function will
    understand them. That is, if they don't start with a / then their parent
    is prepended, this allows a fair degree of flexability. */
 // ---------------------------------------------------------------------
 /* Directories are specified in such a way that the FindDir function will
    understand them. That is, if they don't start with a / then their parent
    is prepended, this allows a fair degree of flexability. */

-bool pkglibInitialize(Configuration &Cnf)
+bool pkgInitialize(Configuration &Cnf)

 {
    // General APT things
 {
    // 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/");
 
    // 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::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
    
    // Cache

-   Cnf.Set("Dir::Cache","/etc/apt/");
+   Cnf.Set("Dir::Cache","/var/cache/apt/");

    Cnf.Set("Dir::Cache::archives","archives/");
    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");
    
    // 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;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/