summaryrefslogtreecommitdiff
path: root/apt-pkg/upgrade.cc
diff options
context:
space:
mode:
Diffstat (limited to 'apt-pkg/upgrade.cc')
-rw-r--r--apt-pkg/upgrade.cc23
1 files changed, 1 insertions, 22 deletions
diff --git a/apt-pkg/upgrade.cc b/apt-pkg/upgrade.cc
index c9432aa64..06c3751e0 100644
--- a/apt-pkg/upgrade.cc
+++ b/apt-pkg/upgrade.cc
@@ -119,12 +119,7 @@ static bool pkgDistUpgrade(pkgDepCache &Cache, OpProgress * const Progress)
if (Progress != NULL)
Progress->Done();
return success;
-}
-bool pkgDistUpgrade(pkgDepCache &Cache)
-{
- return pkgDistUpgrade(Cache, NULL);
-}
- /*}}}*/
+} /*}}}*/
// AllUpgradeNoNewPackages - Upgrade but no removals or new pkgs /*{{{*/
static bool pkgAllUpgradeNoNewPackages(pkgDepCache &Cache, OpProgress * const Progress)
{
@@ -224,20 +219,6 @@ static bool pkgAllUpgradeWithNewPackages(pkgDepCache &Cache, OpProgress * const
return success;
}
/*}}}*/
-// AllUpgrade - Upgrade as many packages as possible /*{{{*/
-// ---------------------------------------------------------------------
-/* Right now the system must be consistent before this can be called.
- It also will not change packages marked for install, it only tries
- to install packages not marked for install */
-static bool pkgAllUpgrade(pkgDepCache &Cache, OpProgress * const Progress)
-{
- return pkgAllUpgradeNoNewPackages(Cache, Progress);
-}
-bool pkgAllUpgrade(pkgDepCache &Cache)
-{
- return pkgAllUpgrade(Cache, NULL);
-}
- /*}}}*/
// MinimizeUpgrade - Minimizes the set of packages to be upgraded /*{{{*/
// ---------------------------------------------------------------------
/* This simply goes over the entire set of packages and tries to keep
@@ -286,7 +267,6 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache)
// APT::Upgrade::Upgrade - Upgrade using a specific strategy /*{{{*/
bool APT::Upgrade::Upgrade(pkgDepCache &Cache, int mode, OpProgress * const Progress)
{
-APT_IGNORE_DEPRECATED_PUSH
if (mode == ALLOW_EVERYTHING)
return pkgDistUpgrade(Cache, Progress);
else if ((mode & ~FORBID_REMOVE_PACKAGES) == 0)
@@ -295,7 +275,6 @@ APT_IGNORE_DEPRECATED_PUSH
return pkgAllUpgradeNoNewPackages(Cache, Progress);
else
_error->Error("pkgAllUpgrade called with unsupported mode %i", mode);
-APT_IGNORE_DEPRECATED_POP
return false;
}
/*}}}*/