X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b2e465d6d32d2dc884f58b94acb7e35f671a87fe..2ac6ce927cda2847baf8e71a74e595e6b82c6d98:/apt-pkg/init.cc?ds=sidebyside diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 01b9d8665..f4b816c0b 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.15 2001/02/20 07:03:17 jgg Exp $ +// $Id: init.cc,v 1.21 2004/02/27 00:46:44 mdz Exp $ /* ###################################################################### Init - Initialize the package library @@ -39,6 +39,7 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.Set("APT::Architecture",COMMON_CPU); else Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU); + Cnf.Set("APT::Build-Essential::", "build-essential"); Cnf.Set("Dir","/"); // State @@ -63,11 +64,13 @@ bool pkgInitConfig(Configuration &Cnf) // Configuration Cnf.Set("Dir::Etc","etc/apt/"); Cnf.Set("Dir::Etc::sourcelist","sources.list"); + 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 @@ -90,7 +93,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; } /*}}}*/ @@ -121,7 +132,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);