diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2008-03-11 17:40:15 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2008-03-11 17:40:15 +0100 |
| commit | 9dbe6ae43a5a78f68a4863650a5d23eb9051d0f7 (patch) | |
| tree | 5035c0a9c1369b177c4a1e9dbd1d6d786113cc2f | |
| parent | 38965a34274c10d6eb9f0837a9ba4a8b04d24639 (diff) | |
- run the problemResolver after a task was installed
so that it can correct any missing dependencies
| -rw-r--r-- | cmdline/apt-get.cc | 5 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 920e5e2ec..fe9416f1a 100644 --- a/cmdline/apt-get.cc +++ b/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); diff --git a/debian/changelog b/debian/changelog index 6a83107fe..da4779f8b 100644 --- a/debian/changelog +++ b/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 |