[apt-get] add possibility to hide the user simulation note

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 97c83c9b0dee969c973f92a5884e8141ccaca496..2ca0855b62a1063e69243a6190b29d4f413251f2 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2793,11 +2793,12 @@ int main(int argc,const char *argv[])                                   /*{{{*/
    // simulate user-friendly if apt-get has no root privileges
    if (getuid() != 0 && _config->FindB("APT::Get::Simulate") == true)
    {
-      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"
-        "      so don't depend on the relevance to the real current situation!"
-        ) << std::endl;
+      if (_config->FindB("APT::Get::Show-User-Simulation-Note",true) == true)
+        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"
+           "      so don't depend on the relevance to the real current situation!"
+        ) << std::endl;
       _config->Set("Debug::NoLocking",true);
    }
 

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index e7f6d7094468c27095200436a56989943cb82e29..50971d0f55110d5cdfd0191097fdbc0555ad8556 100644 (file)
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -364,7 +364,8 @@
      Configuration Item: <literal>APT::Get::Simulate</literal>.</para>
 
      <para>Simulation run as user will deactivate locking (<literal>Debug::NoLocking</literal>)
-     automatical and display a notice indicating that this is only a simulation.
+     automatical. Also a notice will be displayed indicating that this is only a simulation,
+     if the option <literal>APT::Get::Show-User-Simulation-Note</literal> is set (Default: true)
      Neigther NoLocking nor the notice will be triggered if run as root (root should know what
      he is doing without further warnings by <literal>apt-get</literal>).</para>
 

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index cea0dcc0919cdaac14f37b48b24e83ddbf459071..ce56f15632d00088bcd8cd2cb52c33a952df3a27 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -55,6 +55,7 @@ APT
      Diff-Only "false";
      Tar-Only "false";
      Build-Dep-Automatic "true";
+     Show-User-Simulation-Note "true";
   };
 
   Cache