diff options
| author | Michael Vogt <mvo@debian.org> | 2013-07-24 22:06:18 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-07-24 22:06:18 +0200 |
| commit | f39daeb1f66b8910f91274055bf07c3d008cdc50 (patch) | |
| tree | 9283950ebf8a3089b8b16b1d09c3aec8ecc5eb07 /cmdline/apt-get.cc | |
| parent | 267275c59cc35704789a228c6e9b1464c4cabd74 (diff) | |
| parent | c7a629dd114c41a1244744e2f5085df2f505dc90 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid'
Diffstat (limited to 'cmdline/apt-get.cc')
| -rw-r--r-- | cmdline/apt-get.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 999f2a6a7..85ed80a95 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1962,7 +1962,6 @@ bool DoInstall(CommandLine &CmdL) if (Fix != NULL) { // Call the scored problem resolver - Fix->InstallProtect(); Fix->Resolve(true); delete Fix; } @@ -3123,8 +3122,7 @@ bool DoBuildDep(CommandLine &CmdL) } } } - - Fix.InstallProtect(); + if (Fix.Resolve(true) == false) _error->Discard(); |