Przeglądaj źródła

- run the problemResolver after a task was installed
so that it can correct any missing dependencies

Michael Vogt 18 lat temu
rodzic
commit
9dbe6ae43a
2 zmienionych plików z 6 dodań i 1 usunięć
  1. 4 1
      cmdline/apt-get.cc
  2. 2 0
      debian/changelog

+ 4 - 1
cmdline/apt-get.cc

@@ -1506,10 +1506,13 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix,
       buf[end-start] = 0x0;
       if (regexec(&Pattern,buf,0,0,0) != 0)
 	 continue;
-      res &= TryToInstall(Pkg,Cache,Fix,Remove,false,ExpectedInst);
+      res &= TryToInstall(Pkg,Cache,Fix,Remove,true,ExpectedInst);
       found = true;
    }
    
+   // now let the problem resolver deal with any issues
+   Fix.Resolve(true);
+
    if(!found)
       _error->Error(_("Couldn't find task %s"),taskname);
 

+ 2 - 0
debian/changelog

@@ -19,6 +19,8 @@ apt (0.7.12) UNRELEASED; urgency=low
     - remember hosts with Resolve failures or connect Timeouts
   * cmdline/apt-get.cc:
     - fix incorrect help output for -f (LP: #57487)
+    - run the problemResolver after a task was installed
+      so that it can correct any missing dependencies
   * debian/apt.cron.daily:
     - sleep random amount of time (default within 0-30min) before
       starting the upate to hit the mirrors less hard