The entire concept of PendingError() is flawed :/.

[apt.git] / apt-private / private-main.cc

diff --git a/apt-private/private-main.cc b/apt-private/private-main.cc
index 668b1733ae683b1e252f29e34fe211d4229c4111..52f35cfdc08d4f1b2f5decdaa494161950826006 100644 (file)
--- a/apt-private/private-main.cc
+++ b/apt-private/private-main.cc
@@ -2,10 +2,14 @@
 
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/configuration.h>
 
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/configuration.h>

+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>

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

+#include <locale>
+

 #include <string.h>
 #include <unistd.h>
 #include <signal.h>
 #include <string.h>
 #include <unistd.h>
 #include <signal.h>


@@ -13,27 +17,75 @@
 #include <apti18n.h>
 
 
 #include <apti18n.h>
 
 

-void InitSignals()
+void InitLocale(APT_CMD const binary)                          /*{{{*/
+{
+   try {
+      std::locale::global(std::locale(""));
+   } catch (...) {
+      setlocale(LC_ALL, "");
+   }
+   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_DUMP_SOLVER:
+      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_PLANNER:
+      case APT_CMD::APT_INTERNAL_SOLVER:
+      case APT_CMD::APT_SORTPKG:
+        textdomain("apt-utils");
+        break;
+   }
+}
+void InitLocale() {}
+                                                                       /*}}}*/
+void InitSignals()                                                     /*{{{*/

 {
 {

-   // Setup the signals

    signal(SIGPIPE,SIG_IGN);
 }
    signal(SIGPIPE,SIG_IGN);
 }

-
-
-void CheckSimulateMode(CommandLine &CmdL)
+                                                                       /*}}}*/
+void CheckIfSimulateMode(CommandLine &CmdL)                            /*{{{*/

 {
 {

-   // simulate user-friendly if apt-get has no root privileges
-   if (getuid() != 0 && _config->FindB("APT::Get::Simulate") == true &&
+   // disable locking in simulation, but show the message only for users
+   // as root hasn't the same problems like unreadable files which can heavily
+   // distort the simulation.
+   if (_config->FindB("APT::Get::Simulate") == true &&

        (CmdL.FileSize() == 0 ||
         (strcmp(CmdL.FileList[0], "source") != 0 && strcmp(CmdL.FileList[0], "download") != 0 &&
          strcmp(CmdL.FileList[0], "changelog") != 0)))
    {
        (CmdL.FileSize() == 0 ||
         (strcmp(CmdL.FileList[0], "source") != 0 && strcmp(CmdL.FileList[0], "download") != 0 &&
          strcmp(CmdL.FileList[0], "changelog") != 0)))
    {

-      if (_config->FindB("APT::Get::Show-User-Simulation-Note",true) == true)
-         std::cout << _("NOTE: This is only a simulation!\n"
-           "      apt-get needs root privileges for real execution.\n"
+      if (getuid() != 0 && _config->FindB("APT::Get::Show-User-Simulation-Note",true) == true)
+        // TRANSLATORS: placeholder is a binary name like apt or apt-get
+        ioprintf(std::cout, _("NOTE: This is only a simulation!\n"
+           "      %s needs root privileges for real execution.\n"

            "      Keep also in mind that locking is deactivated,\n"
            "      Keep also in mind that locking is deactivated,\n"

-           "      so don't depend on the relevance to the real current situation!"
-        ) << std::endl;
+           "      so don't depend on the relevance to the real current situation!\n"),
+           _config->Find("Binary").c_str());

       _config->Set("Debug::NoLocking",true);
    }
 }
       _config->Set("Debug::NoLocking",true);
    }
 }

+                                                                       /*}}}*/
+void CheckIfCalledByScript(int argc, const char *argv[])               /*{{{*/
+{
+   if (unlikely(argc < 1)) return;
+
+   if(!isatty(STDOUT_FILENO) &&
+      _config->FindB("Apt::Cmd::Disable-Script-Warning", false) == false)
+   {
+      std::cerr << std::endl
+                << "WARNING: " << flNotDir(argv[0]) << " "
+                << "does not have a stable CLI interface. "
+                << "Use with caution in scripts."
+                << std::endl
+                << std::endl;
+   }
+}
+                                                                       /*}}}*/