look into the right textdomain for apt-utils again

Broken in e7e10e47476606e3b2274cf66b1e8ea74b236757 by looking always
into "apt" while we ship some tools in "apt-utils"…

diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index 82908591651f3b02a11f0978c69201500181b768..7e50b140156ce7b4e560278b3488a570ba89b793 100644 (file)
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -10,6 +10,7 @@
 #include <apt-pkg/strutl.h>
 
 #include <apt-private/private-cmndline.h>
 #include <apt-pkg/strutl.h>
 
 #include <apt-private/private-cmndline.h>

+#include <apt-private/private-main.h>

 
 #include <stdarg.h>
 #include <string.h>
 
 #include <stdarg.h>
 #include <string.h>


@@ -451,6 +452,7 @@ std::vector<CommandLine::Dispatch> ParseCommandLine(CommandLine &CmdL, APT_CMD c
       Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char *argv[],
       bool (*ShowHelp)(CommandLine &), std::vector<aptDispatchWithHelp> (*GetCommands)(void))
 {
       Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char *argv[],
       bool (*ShowHelp)(CommandLine &), std::vector<aptDispatchWithHelp> (*GetCommands)(void))
 {

+   InitLocale(Binary);

    if (Cnf != NULL && pkgInitConfig(**Cnf) == false)
    {
       _error->DumpErrors();
    if (Cnf != NULL && pkgInitConfig(**Cnf) == false)
    {
       _error->DumpErrors();

diff --git a/apt-private/private-main.cc b/apt-private/private-main.cc
index 0a9f4713fcd8c9b1fafd845440a13eef0e46259c..0075f813f35fda73a97a2c4652096df631cf34ba 100644 (file)
--- a/apt-private/private-main.cc
+++ b/apt-private/private-main.cc
@@ -16,11 +16,29 @@
 #include <apti18n.h>
 
 
 #include <apti18n.h>
 
 

-void InitLocale()                                                      /*{{{*/
+void InitLocale(APT_CMD const binary)                          /*{{{*/

 {
    std::locale::global(std::locale(""));
 {
    std::locale::global(std::locale(""));

-   textdomain(PACKAGE);
+   switch(binary)
+   {
+      case APT_CMD::APT:
+      case APT_CMD::APT_CACHE:
+      case APT_CMD::APT_CDROM:
+      case APT_CMD::APT_CONFIG:
+      case APT_CMD::APT_HELPER:
+      case APT_CMD::APT_GET:
+      case APT_CMD::APT_MARK:
+        textdomain("apt");
+        break;
+      case APT_CMD::APT_EXTRACTTEMPLATES:
+      case APT_CMD::APT_FTPARCHIVE:
+      case APT_CMD::APT_INTERNAL_SOLVER:
+      case APT_CMD::APT_SORTPKG:
+        textdomain("apt-utils");
+        break;
+   }

 }
 }

+void InitLocale() {}

                                                                        /*}}}*/
 void InitSignals()                                                     /*{{{*/
 {
                                                                        /*}}}*/
 void InitSignals()                                                     /*{{{*/
 {

diff --git a/apt-private/private-main.h b/apt-private/private-main.h
index db6d3e0b7011bfce1f76a4f44fb4d9fcc57c791e..0d60797edfe3b1b0ee4db691200a245494ca776c 100644 (file)
--- a/apt-private/private-main.h
+++ b/apt-private/private-main.h
@@ -1,11 +1,14 @@
 #ifndef APT_PRIVATE_MAIN_H
 #define APT_PRIVATE_MAIN_H
 
 #ifndef APT_PRIVATE_MAIN_H
 #define APT_PRIVATE_MAIN_H
 

+#include <apt-private/private-cmndline.h>
+

 #include <apt-pkg/macros.h>
 
 class CommandLine;
 
 #include <apt-pkg/macros.h>
 
 class CommandLine;
 

-APT_PUBLIC void InitLocale();
+void InitLocale(APT_CMD const binary);
+APT_PUBLIC APT_DEPRECATED_MSG("Is a no-op now") void InitLocale();

 APT_PUBLIC void InitSignals();
 APT_PUBLIC void CheckIfSimulateMode(CommandLine &CmdL);
 APT_PUBLIC void CheckIfCalledByScript(int argc, const char *argv[]);
 APT_PUBLIC void InitSignals();
 APT_PUBLIC void CheckIfSimulateMode(CommandLine &CmdL);
 APT_PUBLIC void CheckIfCalledByScript(int argc, const char *argv[]);

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 4818330848e72af9f1d87320d7d7edb409187881..6153f0e49d03fd79840cc9c57090c2adad3e96fd 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1142,8 +1142,6 @@ static std::vector<aptDispatchWithHelp> GetCommands()                     /*{{{*/
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {

-   InitLocale();
-

    // Parse the command line and initialize the package library
    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_CACHE, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
    // Parse the command line and initialize the package library
    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_CACHE, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index ba01a4c7475aa0664f44b2a275dfeffd86ad06f1..bac808a416e4beb2fe3a3451a8f61f586edea6d2 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -225,8 +225,6 @@ static std::vector<aptDispatchWithHelp> GetCommands()                       /*{{{*/
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {

-   InitLocale();
-

    // Parse the command line and initialize the package library
    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_CDROM, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
    // Parse the command line and initialize the package library
    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_CDROM, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);

diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index 69485de9091f2e4c908404a3f5a0eec99255aba7..6953a81722ed5985af7ef8b449ef2198309a815b 100644 (file)
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -97,8 +97,6 @@ static std::vector<aptDispatchWithHelp> GetCommands()                 /*{{{*/
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {

-   InitLocale();
-

    // Parse the command line and initialize the package library
    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_CONFIG, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
    // Parse the command line and initialize the package library
    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_CONFIG, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 8f77425e4f7966af07bdf77990d9a6fcd5c98aba..a4468b9893eb7016ca7d7fa637a6e7d4b7fd4c70 100644 (file)
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -339,8 +339,6 @@ static std::vector<aptDispatchWithHelp> GetCommands()                       /*{{{*/
                                                                        /*}}}*/
 int main(int argc, const char **argv)                                  /*{{{*/
 {
                                                                        /*}}}*/
 int main(int argc, const char **argv)                                  /*{{{*/
 {

-       InitLocale();
-

        CommandLine CmdL;
        auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_EXTRACTTEMPLATES, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
 
        CommandLine CmdL;
        auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_EXTRACTTEMPLATES, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
 

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 4ac15274cd4ff1946a665e4e41ad9424202b1f2f..73db71f00d787749a60cd6e54aac1b03c77b6e51 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -432,8 +432,6 @@ static std::vector<aptDispatchWithHelp> GetCommands()                       /*{{{*/
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {

-   InitLocale();
-

    // Parse the command line and initialize the package library
    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_GET, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
    // Parse the command line and initialize the package library
    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_GET, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);

diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index fd4d269c2f52003e153cd3d062917ae0a704e43f..f3b8c326ec05627c9f064b18081520266037cda8 100644 (file)
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -199,8 +199,6 @@ static std::vector<aptDispatchWithHelp> GetCommands()                       /*{{{*/
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {

-   InitLocale();
-

    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_HELPER, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
 
    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_HELPER, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
 

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 12f4d6f938198e36927946129e3549357c7cb597..80f92152a86772e239753c97b7821b596efb3be9 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -65,8 +65,6 @@ static std::vector<aptDispatchWithHelp> GetCommands()                 /*{{{*/
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {

-       InitLocale();
-

        // we really don't need anything
        DropPrivileges();
 
        // we really don't need anything
        DropPrivileges();
 

diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index 4e86edc77885c8306836b59f6be59c5812cba336..0cba31e703ce7b1aa3d47cb48130e80297ff7157 100644 (file)
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -316,8 +316,6 @@ static std::vector<aptDispatchWithHelp> GetCommands()                       /*{{{*/
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {

-   InitLocale();
-

    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_MARK, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
 
    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_MARK, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
 

diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index 9495ee354a04d3242d6ae79688a7d9e90f0441bc..b80bbedd6d93e39c4205c5b6e1b28b5680c7c925 100644 (file)
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -152,8 +152,6 @@ static std::vector<aptDispatchWithHelp> GetCommands()                       /*{{{*/
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {
                                                                        /*}}}*/
 int main(int argc,const char *argv[])                                  /*{{{*/
 {

-   InitLocale();
-

    CommandLine CmdL;
    ParseCommandLine(CmdL, APT_CMD::APT_SORTPKG, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
 
    CommandLine CmdL;
    ParseCommandLine(CmdL, APT_CMD::APT_SORTPKG, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
 

diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 3c3d3ca1c88bf9005274b27f498e5587e956ce0a..4b266bcbe94b61e496dd76cb19473256a76cd1bd 100644 (file)
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -97,8 +97,6 @@ static std::vector<aptDispatchWithHelp> GetCommands()                 /*{{{*/
                                                                        /*}}}*/
 int main(int argc, const char *argv[])                                 /*{{{*/
 {
                                                                        /*}}}*/
 int main(int argc, const char *argv[])                                 /*{{{*/
 {

-   InitLocale();
-

    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
 
    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT, &_config, &_system, argc, argv, &ShowHelp, &GetCommands);
 

diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index d985646f7ae7e7efb0144a2b2c64bc494dbf7e22..ab6f48d616424b403ba11eed4ce2db0bf5fbff63 100644 (file)
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -1044,8 +1044,6 @@ static std::vector<aptDispatchWithHelp> GetCommands()                     /*{{{*/
                                                                        /*}}}*/
 int main(int argc, const char *argv[])                                 /*{{{*/
 {
                                                                        /*}}}*/
 int main(int argc, const char *argv[])                                 /*{{{*/
 {

-   InitLocale();
-

    // Parse the command line and initialize the package library
    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_FTPARCHIVE, &_config, NULL, argc, argv, ShowHelp, &GetCommands);
    // Parse the command line and initialize the package library
    CommandLine CmdL;
    auto const Cmds = ParseCommandLine(CmdL, APT_CMD::APT_FTPARCHIVE, &_config, NULL, argc, argv, ShowHelp, &GetCommands);