* apt-pkg/indexcopy.cc:

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

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 15efb1a3d58b708518a6cd78daa5cdeaa43b48a9..a30f278441ff4ff9b5840a4719ac529ab757acb2 100644 (file)
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -51,7 +51,8 @@ bool pkgInitConfig(Configuration &Cnf)
        
    Cnf.Set("Dir::State::lists","lists/");
    Cnf.Set("Dir::State::cdroms","cdroms.list");
        
    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/");


@@ -65,40 +66,53 @@ bool pkgInitConfig(Configuration &Cnf)
    Cnf.Set("Dir::Etc::vendorlist","vendors.list");
    Cnf.Set("Dir::Etc::vendorparts","vendors.list.d");
    Cnf.Set("Dir::Etc::main","apt.conf");
    Cnf.Set("Dir::Etc::vendorlist","vendors.list");
    Cnf.Set("Dir::Etc::vendorparts","vendors.list.d");
    Cnf.Set("Dir::Etc::main","apt.conf");

+   Cnf.Set("Dir::Etc::netrc", "auth.conf");

    Cnf.Set("Dir::Etc::parts","apt.conf.d");
    Cnf.Set("Dir::Etc::preferences","preferences");
    Cnf.Set("Dir::Etc::preferencesparts","preferences.d");
    Cnf.Set("Dir::Etc::parts","apt.conf.d");
    Cnf.Set("Dir::Etc::preferences","preferences");
    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::Media::MountPath","/media/apt");

 
    // State   
    Cnf.Set("Dir::Log","var/log/apt");
    Cnf.Set("Dir::Log::Terminal","term.log");
 
    // State   
    Cnf.Set("Dir::Log","var/log/apt");
    Cnf.Set("Dir::Log::Terminal","term.log");

+   Cnf.Set("Dir::Log::History","history.log");
+
+   Cnf.Set("Dir::Ignore-Files-Silently::", "~$");
+   Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$");
+   Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
+   Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");

 
    // Translation
    Cnf.Set("APT::Acquire::Translation", "environment");
 
 
    // Translation
    Cnf.Set("APT::Acquire::Translation", "environment");
 

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

    bool Res = true;
    
    // Read an alternate config file
    const char *Cfg = getenv("APT_CONFIG");
    if (Cfg != 0)
    {
    bool Res = true;
    
    // Read an alternate config file
    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
    string Parts = Cnf.FindDir("Dir::Etc::parts");
    }
 
    // Read the configuration parts dir
    string Parts = Cnf.FindDir("Dir::Etc::parts");

-   if (FileExists(Parts) == true)
+   if (DirectoryExists(Parts) == true)

       Res &= ReadConfigDir(Cnf,Parts);
    else
       Res &= ReadConfigDir(Cnf,Parts);
    else

-      _error->WarningE("FileExists",_("Unable to read %s"),Parts.c_str());
+      _error->WarningE("DirectoryExists",_("Unable to read %s"),Parts.c_str());

 
    // 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)