Working acquire code

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

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 63e808118531d37647515960d557ffc63aafbd65..f79668c543617e32ce939f1ec7daa5e125de19d7 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.3 1998/07/16 06:08:36 jgg Exp $
+// $Id: init.cc,v 1.10 1998/11/05 07:21:42 jgg Exp $

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


@@ -9,6 +9,10 @@
                                                                        /*}}}*/
 // Include files                                                       /*{{{*/
 #include <apt-pkg/init.h>
                                                                        /*}}}*/
 // Include files                                                       /*{{{*/
 #include <apt-pkg/init.h>

+#include <config.h>
+
+#include <sys/stat.h>
+#include <unistd.h>

                                                                        /*}}}*/
 
 // pkgInitialize - Initialize the configuration class                  /*{{{*/
                                                                        /*}}}*/
 
 // pkgInitialize - Initialize the configuration class                  /*{{{*/


@@ -19,25 +23,48 @@
 bool pkgInitialize(Configuration &Cnf)
 {
    // General APT things
 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/");
 
    // 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");

    
    // 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");
+   
+   // Read the main config file
+   string FName = Cnf.FindFile("Dir::Etc::main");
+   struct stat Buf;   
+   if (stat(FName.c_str(),&Buf) != 0)
+      return true;
+   
+   // Read an alternate config file
+   const char *Cfg = getenv("APT_CONFIG");
+   
+   // Read both config files, either existing will be OK
+   if ((ReadConfigFile(Cnf,FName) != true) |
+       (ReadConfigFile(Cnf,Cfg) != true))
+      return false;

    
    

+   if (Cnf.FindB("Debug::pkgInitialize",false) == true)
+      Cnf.Dump();
+      

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/