* merged with mainline

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

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 5a2e6761f5b1ad4d39c2096ae834730d3ba05286..b47378d4a96ad6c87565bc010e7797b65996a375 100644 (file)
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: init.cc,v 1.18 2002/10/16 05:21:33 jgg Exp $
+// $Id: init.cc,v 1.20 2003/02/09 20:31:05 doogie Exp $
 /* ######################################################################
 
    Init - Initialize the package library
@@ -64,13 +64,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
@@ -94,11 +95,13 @@ bool pkgInitConfig(Configuration &Cnf)
    if (Cnf.FindB("Debug::pkgInitConfig",false) == true)
       Cnf.Dump();
    
+#ifdef APT_DOMAIN
    if (Cnf.Exists("Dir::Locale"))
    {  
-      bindtextdomain(DOMAIN,Cnf.FindDir("Dir::Locale").c_str());
+      bindtextdomain(APT_DOMAIN,Cnf.FindDir("Dir::Locale").c_str());
       bindtextdomain(textdomain(0),Cnf.FindDir("Dir::Locale").c_str());
    }
+#endif
    
    return true;
 }
@@ -130,7 +133,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);