From 40703260cdb40409e930a53a04a4061cf2173f42 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 8 Apr 2016 12:50:08 +0200 Subject: do not require non-broken systems in 'upgrade' There is a good chance that the attempt will fail, but if a user mentions certain packages explicitly on the commandline there is a chance that this will consist of a broken system which is resolved by upgrading more packages then just the mentioned. This limitation was not effecting external resolvers. --- apt-pkg/upgrade.cc | 8 -------- 1 file changed, 8 deletions(-) (limited to 'apt-pkg/upgrade.cc') diff --git a/apt-pkg/upgrade.cc b/apt-pkg/upgrade.cc index e7f2aae40..06707847e 100644 --- a/apt-pkg/upgrade.cc +++ b/apt-pkg/upgrade.cc @@ -136,12 +136,8 @@ static bool pkgAllUpgradeNoNewPackages(pkgDepCache &Cache, OpProgress * const Pr Progress->OverallProgress(0, 100, 1, _("Calculating upgrade")); pkgDepCache::ActionGroup group(Cache); - pkgProblemResolver Fix(&Cache); - if (Cache.BrokenCount() != 0) - return false; - // Upgrade all installed packages for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I) { @@ -182,12 +178,8 @@ static bool pkgAllUpgradeWithNewPackages(pkgDepCache &Cache, OpProgress * const Progress->OverallProgress(0, 100, 1, _("Calculating upgrade")); pkgDepCache::ActionGroup group(Cache); - pkgProblemResolver Fix(&Cache); - if (Cache.BrokenCount() != 0) - return false; - // provide the initial set of stuff we want to upgrade by marking // all upgradable packages for upgrade for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I) -- cgit v1.2.3