merge with debian-experimental 0.8.16~exp2 release

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

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index f0bad78dfd25c804aba2e7cad85caee11abe691b..66b0119e605270df61466fe2e879b308eff47003 100644 (file)
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -52,7 +52,7 @@ bool pkgInitConfig(Configuration &Cnf)
    Cnf.Set("Dir::State::lists","lists/");
    Cnf.Set("Dir::State::cdroms","cdroms.list");
    Cnf.Set("Dir::State::mirrors","mirrors/");
    Cnf.Set("Dir::State::lists","lists/");
    Cnf.Set("Dir::State::cdroms","cdroms.list");
    Cnf.Set("Dir::State::mirrors","mirrors/");

-   
+

    // Cache
    Cnf.Set("Dir::Cache","var/cache/apt/");
    Cnf.Set("Dir::Cache::archives","archives/");
    // Cache
    Cnf.Set("Dir::Cache","var/cache/apt/");
    Cnf.Set("Dir::Cache::archives","archives/");


@@ -72,7 +72,9 @@ bool pkgInitConfig(Configuration &Cnf)
    Cnf.Set("Dir::Etc::preferencesparts","preferences.d");
    Cnf.Set("Dir::Etc::trusted", "trusted.gpg");
    Cnf.Set("Dir::Etc::trustedparts","trusted.gpg.d");
    Cnf.Set("Dir::Etc::preferencesparts","preferences.d");
    Cnf.Set("Dir::Etc::trusted", "trusted.gpg");
    Cnf.Set("Dir::Etc::trustedparts","trusted.gpg.d");

+

    Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
    Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");

+   Cnf.Set("Dir::Bin::solvers::","/usr/lib/apt/solvers");

    Cnf.Set("Dir::Media::MountPath","/media/apt");
 
    // State   
    Cnf.Set("Dir::Media::MountPath","/media/apt");
 
    // State   


@@ -85,8 +87,8 @@ bool pkgInitConfig(Configuration &Cnf)
    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
 
    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
 

-   // Translation
-   Cnf.Set("APT::Acquire::Translation", "environment");
+   // Default cdrom mount point
+   Cnf.Set("Acquire::cdrom::mount", "/media/cdrom/");

 
    bool Res = true;
    
 
    bool Res = true;
    


@@ -94,10 +96,10 @@ bool pkgInitConfig(Configuration &Cnf)
    const char *Cfg = getenv("APT_CONFIG");
    if (Cfg != 0)
    {
    const char *Cfg = getenv("APT_CONFIG");
    if (Cfg != 0)
    {

-      if (FileExists(Cfg) == true)
+      if (RealFileExists(Cfg) == true)

         Res &= ReadConfigFile(Cnf,Cfg);
       else
         Res &= ReadConfigFile(Cnf,Cfg);
       else

-        _error->WarningE("FileExists",_("Unable to read %s"),Cfg);
+        _error->WarningE("RealFileExists",_("Unable to read %s"),Cfg);

    }
 
    // Read the configuration parts dir
    }
 
    // Read the configuration parts dir


@@ -109,7 +111,7 @@ bool pkgInitConfig(Configuration &Cnf)
 
    // Read the main config file
    string FName = Cnf.FindFile("Dir::Etc::main");
 
    // Read the main config file
    string FName = Cnf.FindFile("Dir::Etc::main");

-   if (FileExists(FName) == true)
+   if (RealFileExists(FName) == true)

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