commit debian/changelog for final 0.7.25.2 upload

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

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 46017bf0ce3775c7be3c1525e15041a531cbcea0..d8c201b9de02c22e887d9148572474171632a327 100644 (file)
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -65,10 +65,12 @@ 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::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::Media::MountPath","/media/apt");
 
    // State   
    Cnf.Set("Dir::Log","var/log/apt");
@@ -104,28 +106,6 @@ bool pkgInitConfig(Configuration &Cnf)
    if (Res == false)
       return false;
 
-   // we load all config files, now check the configs and setup post-defaults:
-   // * check for CompressionTypes setup
-   {
-      Configuration::Item const *Opts = _config->Tree("Acquire::CompressionTypes");
-      if (Opts != 0)
-        Opts = Opts->Child;
-      bool foundLzma=false, foundBzip2=false, foundGzip=false;
-      for (; Opts != 0; Opts = Opts->Next)
-      {
-        if (Opts->Value == "lzma") foundLzma = true;
-        else if (Opts->Value == "bz2") foundBzip2 = true;
-        else if (Opts->Value == "gz") foundGzip = true;
-      }
-      if (!foundBzip2) Cnf.Set("Acquire::CompressionTypes::bz2","bzip2");
-      if (!foundLzma) Cnf.Set("Acquire::CompressionTypes::lzma","lzma");
-      if (!foundGzip) Cnf.Set("Acquire::CompressionTypes::gz","gzip");
-      Cnf.CndSet("Dir::Bin::lzma", "/usr/bin/lzma");
-      Cnf.CndSet("Dir::Bin::bzip2", "/bin/bzip2");
-   }
-
-
-
    if (Cnf.FindB("Debug::pkgInitConfig",false) == true)
       Cnf.Dump();