diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-07-26 10:43:07 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-07-26 10:43:07 +0200 |
| commit | 94bdf40722a406f66383261d36e500213b0c2c38 (patch) | |
| tree | 22739e87f31bbad88214853c5f0e45040403ec25 /cmdline | |
| parent | f0efdda074effd4b8d668c1adfd6ddc4be698ae9 (diff) | |
| parent | dfd1a56e88c068f0085140630306901d01ed0f98 (diff) | |
* merged from apt--mvo
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-get.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 82257a06e..08079af2b 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1507,7 +1507,8 @@ bool DoUpgrade(CommandLine &CmdL) bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, bool BrokenFix, unsigned int& ExpectedInst, - const char *taskname) + const char *taskname, + bool Remove) { const char *start, *end; pkgCache::PkgIterator Pkg; @@ -1536,7 +1537,7 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, buf[end-start] = 0x0; if (regexec(&Pattern,buf,0,0,0) != 0) continue; - res &= TryToInstall(Pkg,Cache,Fix,false,true,ExpectedInst); + res &= TryToInstall(Pkg,Cache,Fix,Remove,true,ExpectedInst); found = true; } @@ -1604,7 +1605,7 @@ bool DoInstall(CommandLine &CmdL) // tasks must always be confirmed ExpectedInst += 1000; // see if we can install it - TryInstallTask(Cache, Fix, BrokenFix, ExpectedInst, S); + TryInstallTask(Cache, Fix, BrokenFix, ExpectedInst, S, Remove); continue; } |