diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2008-03-13 23:19:10 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2008-03-13 23:19:10 +0100 |
| commit | 85bd111a9b0778ba6e2b8950d369aeca192f9555 (patch) | |
| tree | 2bde17d83dd8a638db08edf921095c65d0335a8a | |
| parent | 9dbe6ae43a5a78f68a4863650a5d23eb9051d0f7 (diff) | |
cmdline/apt-get.cc:
- install tasks in two passes, first without dependency auto-install,
the with it. this ensure that we do not run in a situation were
a task packages A dependens on B|C and C is part of the task but
B gets installed too because of the greedy nature of apt
| -rw-r--r-- | cmdline/apt-get.cc | 29 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 19 insertions, 13 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index fe9416f1a..3f9a5b248 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1495,19 +1495,24 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, bool found = false; bool res = true; - for (Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + + // two runs, first ignore dependencies, second install any missing + for(int IgnoreBroken=1; IgnoreBroken >= 0; IgnoreBroken--) { - pkgCache::VerIterator ver = Cache[Pkg].CandidateVerIter(Cache); - if(ver.end()) - continue; - pkgRecords::Parser &parser = Recs.Lookup(ver.FileList()); - parser.GetRec(start,end); - strncpy(buf, start, end-start); - buf[end-start] = 0x0; - if (regexec(&Pattern,buf,0,0,0) != 0) - continue; - res &= TryToInstall(Pkg,Cache,Fix,Remove,true,ExpectedInst); - found = true; + for (Pkg = Cache.PkgBegin(); Pkg.end() == false; Pkg++) + { + pkgCache::VerIterator ver = Cache[Pkg].CandidateVerIter(Cache); + if(ver.end()) + continue; + pkgRecords::Parser &parser = Recs.Lookup(ver.FileList()); + parser.GetRec(start,end); + strncpy(buf, start, end-start); + buf[end-start] = 0x0; + if (regexec(&Pattern,buf,0,0,0) != 0) + continue; + res &= TryToInstall(Pkg,Cache,Fix,Remove,IgnoreBroken,ExpectedInst); + found = true; + } } // now let the problem resolver deal with any issues diff --git a/debian/changelog b/debian/changelog index da4779f8b..5a4051f4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +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 + - do two passes when installing tasks, first ignoring dependencies, + then resolving them and run the problemResolver at the end so that it can correct any missing dependencies * debian/apt.cron.daily: - sleep random amount of time (default within 0-30min) before |