* added gpgv::Options to configure-index

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

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 5a2e6761f5b1ad4d39c2096ae834730d3ba05286..f4b816c0be468c11b7818a2905e4e8b74ff72c3c 100644 (file)
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: init.cc,v 1.18 2002/10/16 05:21:33 jgg Exp $
+// $Id: init.cc,v 1.21 2004/02/27 00:46:44 mdz Exp $

 /* ######################################################################
 
    Init - Initialize the package library
 /* ######################################################################
 
    Init - Initialize the package library


@@ -94,11 +94,13 @@ bool pkgInitConfig(Configuration &Cnf)
    if (Cnf.FindB("Debug::pkgInitConfig",false) == true)
       Cnf.Dump();
    
    if (Cnf.FindB("Debug::pkgInitConfig",false) == true)
       Cnf.Dump();
    

+#ifdef APT_DOMAIN

    if (Cnf.Exists("Dir::Locale"))
    {  
    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());
    }
       bindtextdomain(textdomain(0),Cnf.FindDir("Dir::Locale").c_str());
    }

+#endif

    
    return true;
 }
    
    return true;
 }


@@ -130,7 +132,7 @@ bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys)
       }
       
       if (Sys == 0)
       }
       
       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);
    }
    
    return Sys->Initialize(Cnf);