diff options
| -rw-r--r-- | apt-pkg/packagemanager.cc | 2 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 11 | ||||
| -rw-r--r-- | debian/changelog | 12 |
3 files changed, 20 insertions, 5 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index c62c4d187..093999bc2 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -602,7 +602,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c or by the ConfigureAll call at the end of the for loop in OrderInstall. */ bool Changed = false; const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500); - unsigned int i; + unsigned int i = 0; do { Changed = false; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 4e6cc32de..dd9313bff 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1679,10 +1679,13 @@ bool DoUpdate(CommandLine &CmdL) ListUpdate(Stat, *List); // Rebuild the cache. - pkgCacheFile::RemoveCaches(); - if (Cache.BuildCaches() == false) - return false; - + if (_config->FindB("pkgCacheFile::Generate", true) == true) + { + pkgCacheFile::RemoveCaches(); + if (Cache.BuildCaches() == false) + return false; + } + return true; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 7cfa37e52..10f515a70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apt (0.9.1) unstable; urgency=low + + [ David Kalnischkies ] + * cmdline/apt-get.cc: + - if pkgCacheFile::Generate is disabled in 'update' don't + remove the caches (and don't try to open them) + * apt-pkg/packagemanager.cc: + - init counter in SmartConfigure so that the loop-breaker isn't + triggered at random… (Closes: #669060) + + -- David Kalnischkies <kalnischkies@gmail.com> Mon, 16 Apr 2012 23:15:22 +0200 + apt (0.9.0) unstable; urgency=low * upload to debian/unstable |