From 0dde581905291223e3f3b67cc739bd4db1e2055f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 18 Jan 2017 11:31:13 +0100 Subject: don't show update stats if cache generation is disabled Unlikely that anyone is actually running into this, but if we asked to not generate a cache and avoid it in the first step we shouldn't create one implicitly anyway by displaying the statistics. (cherry picked from commit 33f982b90a4f77be18cb82daf8c79e9c5513761c) (cherry picked from commit 1d017d04c5fdbf71a35e8f154f01bc94305ad798) --- apt-private/private-update.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'apt-private') diff --git a/apt-private/private-update.cc b/apt-private/private-update.cc index ba953a088..b63b7d963 100644 --- a/apt-private/private-update.cc +++ b/apt-private/private-update.cc @@ -71,13 +71,13 @@ bool DoUpdate(CommandLine &CmdL) ListUpdate(Stat, *List); } + if (_config->FindB("pkgCacheFile::Generate", true) == false) + return true; + // Rebuild the cache. - if (_config->FindB("pkgCacheFile::Generate", true) == true) - { - pkgCacheFile::RemoveCaches(); - if (Cache.BuildCaches() == false) - return false; - } + pkgCacheFile::RemoveCaches(); + if (Cache.BuildCaches() == false) + return false; // show basic stats (if the user whishes) if (_config->FindB("APT::Cmd::Show-Update-Stats", false) == true) -- cgit v1.2.3