* cmdline/apt-get.cc:

  - do not show simulation notice for non-root commands (Closes: #619072)

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 6a30c5a50678522a7ef63ebb3b592de9257320ba..c793b67a5b01a44a65e37e150572a06fe7845d00 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -3278,7 +3278,10 @@ 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)
+   if (getuid() != 0 && _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)))
    {
       if (_config->FindB("APT::Get::Show-User-Simulation-Note",true) == true)
         cout << _("NOTE: This is only a simulation!\n"

diff --git a/debian/changelog b/debian/changelog
index 2af2517e10fde43679e71383777ab755bfc6983a..8e15a806053734ed0383a52269f26ceb232d95bd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,8 +25,10 @@ apt (0.8.13.1) UNRELEASED; urgency=low
   * apt-pkg/aptconfiguration.cc:
     - use dpkg --print-foreign-architectures to get multiarch configuration
       if non is specified with APT::Architectures (Closes: #612958)
+  * cmdline/apt-get.cc:
+    - do not show simulation notice for non-root commands (Closes: #619072)
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 26 Mar 2011 12:26:32 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 26 Mar 2011 12:53:00 +0100
 
 apt (0.8.13) unstable; urgency=low