Revert fixes changes to move these to apt--fixes--0 branch.

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index a161847c8530f2a87d7646e1a4edb1c49cdb0793..6268f49532e1b45e39e800e7ada300a8ef8baa66 100644 (file)
--- 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++)