From 9dd00c9b2291df4d669204db918d333705c37b63 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 12 May 2005 13:36:05 +0000 Subject: Revert fixes changes to move these to apt--fixes--0 branch. --- cmdline/apt-get.cc | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index a161847c8..6268f4953 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1380,15 +1380,6 @@ bool DoUpgrade(CommandLine &CmdL) /* Install named packages */ bool DoInstall(CommandLine &CmdL) { - // Lock the list directory - FileFd Lock; - if (_config->FindB("Debug::NoLocking",false) == false) - { - Lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock")); - if (_error->PendingError() == true) - return _error->Error(_("Unable to lock the list directory")); - } - CacheFile Cache; if (Cache.OpenForInstall() == false || Cache.CheckDeps(CmdL.FileSize() != 1) == false) @@ -1589,8 +1580,8 @@ bool DoInstall(CommandLine &CmdL) { pkgCache::PkgIterator I(Cache,Cache.List[J]); - /* Just look at the ones we want to install but skip all already selected */ - if ((*Cache)[I].Install() == false || (*Cache)[I].NewInstall() == true) + /* Just look at the ones we want to install */ + if ((*Cache)[I].Install() == false) continue; for (pkgCache::VerIterator V = I.VersionList(); V.end() == false; V++) -- cgit v1.2.3