Merge remote-tracking branch 'mvo/feature/apt-binary2' into debian/sid

Conflicts:
	cmdline/apt-get.cc

1 files changed, 26 insertions, 0 deletions

diff --git a/apt-private/private-main.cc b/apt-private/private-main.cc
new file mode 100644
index 000000000..1fdf3f0be
--- /dev/null
+++ b/apt-private/private-main.cc
@@ -0,0 +1,26 @@
+
+#include<unistd.h>
+#include<cstring>
+
+#include <apt-pkg/configuration.h>
+#include "private-main.h"
+
+#include <apti18n.h>
+
+void CheckSimulateMode(CommandLine &CmdL)
+{
+   // simulate user-friendly if apt-get has no root privileges
+   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)
+         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"
+	    "      so don't depend on the relevance to the real current situation!"
+	 ) << std::endl;
+      _config->Set("Debug::NoLocking",true);
+   }
+}