Support for memory-only caching

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

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index e504e4a14679a8ea299fdeed8584ae7ee4709ccb..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.11 1998/11/05 07:42:03 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


@@ -33,6 +33,7 @@ bool pkgInitialize(Configuration &Cnf)
    Cnf.Set("Dir::State::xstatus","xstatus");
    Cnf.Set("Dir::State::userstatus","status.user");   
    Cnf.Set("Dir::State::status","/var/lib/dpkg/status");
    Cnf.Set("Dir::State::xstatus","xstatus");
    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","/var/cache/apt/");
    
    // Cache
    Cnf.Set("Dir::Cache","/var/cache/apt/");


@@ -45,6 +46,7 @@ bool pkgInitialize(Configuration &Cnf)
    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::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");
    
    // Read the main config file
    string FName = Cnf.FindFile("Dir::Etc::main");


@@ -54,7 +56,7 @@ bool pkgInitialize(Configuration &Cnf)
    
    // Read an alternate config file
    const char *Cfg = getenv("APT_CONFIG");
    
    // Read an alternate config file
    const char *Cfg = getenv("APT_CONFIG");

-   if (Cfg != 0 && FileExists(FName) == true)
+   if (Cfg != 0 && FileExists(Cfg) == true)

       Res &= ReadConfigFile(Cnf,Cfg);
    
    if (Res == false)
       Res &= ReadConfigFile(Cnf,Cfg);
    
    if (Res == false)