merge from the lp:~donkult/apt/sid branch

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

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 63caade36a599b818b93ce0e466aa72aef12569b..6310aff112a1ae94ecd4e587e1fed27ecf47dc49 100644 (file)
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -65,14 +65,17 @@ 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::Bin::methods","/usr/lib/apt/methods");
    Cnf.Set("Dir::Etc::parts","apt.conf.d");
    Cnf.Set("Dir::Etc::preferences","preferences");
    Cnf.Set("Dir::Etc::preferencesparts","preferences.d");
    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");

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


@@ -103,7 +106,7 @@ bool pkgInitConfig(Configuration &Cnf)
 
    if (Res == false)
       return false;
 
    if (Res == false)
       return false;

-   
+

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