X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/7d6f9f8ffb7ba9caf7cc25dc102c59616150f36e..90ff41f8a6fdd304ac645f8279464462ca36fccd:/apt-pkg/init.cc

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 3c702af9b..f58855792 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: init.cc,v 1.17 2001/12/05 07:22:39 tausq Exp $
+// $Id: init.cc,v 1.20 2003/02/09 20:31:05 doogie Exp $
 /* ######################################################################
 
    Init - Initialize the package library
@@ -40,6 +40,8 @@ bool pkgInitConfig(Configuration &Cnf)
    else
       Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU);
    Cnf.Set("APT::Build-Essential::", "build-essential");
+   Cnf.Set("APT::Install-Recommends", false);
+   Cnf.Set("APT::Install-Suggests", false);
    Cnf.Set("Dir","/");
    
    // State   
@@ -54,6 +56,7 @@ bool pkgInitConfig(Configuration &Cnf)
        
    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/");
@@ -64,13 +67,14 @@ bool pkgInitConfig(Configuration &Cnf)
    // Configuration
    Cnf.Set("Dir::Etc","etc/apt/");
    Cnf.Set("Dir::Etc::sourcelist","sources.list");
+   Cnf.Set("Dir::Etc::sourceparts","sources.list.d");
    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::parts","apt.conf.d");
    Cnf.Set("Dir::Etc::preferences","preferences");
    Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
-	      
+   
    bool Res = true;
    
    // Read an alternate config file
@@ -93,7 +97,15 @@ bool pkgInitConfig(Configuration &Cnf)
    
    if (Cnf.FindB("Debug::pkgInitConfig",false) == true)
       Cnf.Dump();
-      
+   
+#ifdef APT_DOMAIN
+   if (Cnf.Exists("Dir::Locale"))
+   {  
+      bindtextdomain(APT_DOMAIN,Cnf.FindDir("Dir::Locale").c_str());
+      bindtextdomain(textdomain(0),Cnf.FindDir("Dir::Locale").c_str());
+   }
+#endif
+
    return true;
 }
 									/*}}}*/
@@ -124,7 +136,7 @@ bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys)
       }
       
       if (Sys == 0)
-	 return _error->Error(_("Unable to determine a suitable system type"));
+	 return _error->Error(_("Unable to determine a suitable packaging system type"));
    }
    
    return Sys->Initialize(Cnf);