disable locking even for root in --simulate

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

diff --git a/apt-private/private-main.cc b/apt-private/private-main.cc
index 668b1733ae683b1e252f29e34fe211d4229c4111..3886c7df65474a2ac394ca66d07e14790ddda7c4 100644 (file)
--- a/apt-private/private-main.cc
+++ b/apt-private/private-main.cc
@@ -22,13 +22,15 @@ void InitSignals()
 
 void CheckSimulateMode(CommandLine &CmdL)
 {
 
 void CheckSimulateMode(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)
+      if (getuid() != 0 && _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"
            "      Keep also in mind that locking is deactivated,\n"
          std::cout << _("NOTE: This is only a simulation!\n"
            "      apt-get needs root privileges for real execution.\n"
            "      Keep also in mind that locking is deactivated,\n"