diff options
| author | Otavio Salvador <otavio@debian.org> | 2005-05-12 13:36:05 +0000 |
|---|---|---|
| committer | Otavio Salvador <otavio@debian.org> | 2005-05-12 13:36:05 +0000 |
| commit | 9dd00c9b2291df4d669204db918d333705c37b63 (patch) | |
| tree | 484da2750ae949fe8cd4a3a15217c4419c2a54e0 | |
| parent | b2869b22be57f9243eec6ef1abe118a0252b7172 (diff) | |
Revert fixes changes to move these to apt--fixes--0 branch.
| -rw-r--r-- | cmdline/apt-get.cc | 13 |
1 files 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++) |