summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-04-08 12:50:08 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2016-04-13 21:33:32 +0200
commit40703260cdb40409e930a53a04a4061cf2173f42 (patch)
tree9980a0414e0ecc1653823e8f52d1951c2cce791f
parentc1e7b36400db49d3dcb403512e9b009d1b6d05bc (diff)
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.
-rw-r--r--apt-pkg/upgrade.cc8
1 files changed, 0 insertions, 8 deletions
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)