diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-06-18 20:23:53 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-06-18 20:23:53 +0200 |
| commit | bc5095b7d708c7e376f98be6edc2ad7cceca57ed (patch) | |
| tree | 8b45f6fc974330f964bad3684ac85550480fb66b /apt-pkg/upgrade.cc | |
| parent | 456821f91483f45b3ceb156f54ccc27983b71595 (diff) | |
| parent | 51da0c3587c9d36a3c04b3e28b99d8331a29b230 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
Diffstat (limited to 'apt-pkg/upgrade.cc')
| -rw-r--r-- | apt-pkg/upgrade.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apt-pkg/upgrade.cc b/apt-pkg/upgrade.cc index 7926845c2..29b11937b 100644 --- a/apt-pkg/upgrade.cc +++ b/apt-pkg/upgrade.cc @@ -143,6 +143,12 @@ static bool pkgAllUpgradeNoNewPackages(pkgDepCache &Cache) */ static bool pkgAllUpgradeWithNewPackages(pkgDepCache &Cache) { + std::string const solver = _config->Find("APT::Solver", "internal"); + if (solver != "internal") { + OpTextProgress Prog(*_config); + return EDSP::ResolveExternal(solver.c_str(), Cache, true, false, false, &Prog); + } + pkgDepCache::ActionGroup group(Cache); pkgProblemResolver Fix(&Cache); |