|
|
@@ -22,13 +22,15 @@ void InitSignals()
|
|
|
|
|
|
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)))
|
|
|
{
|
|
|
- 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"
|