diff options
| -rw-r--r-- | apt-pkg/upgrade.cc | 23 | ||||
| -rw-r--r-- | apt-pkg/upgrade.h | 3 | ||||
| -rw-r--r-- | debian/libapt-pkg6.0.symbols | 2 |
3 files changed, 1 insertions, 27 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; } /*}}}*/ diff --git a/apt-pkg/upgrade.h b/apt-pkg/upgrade.h index 5612acfcb..c3d0852b2 100644 --- a/apt-pkg/upgrade.h +++ b/apt-pkg/upgrade.h @@ -28,8 +28,5 @@ namespace APT { } } -APT_DEPRECATED_MSG("Use APT::Upgrade::Upgrade() instead") bool pkgDistUpgrade(pkgDepCache &Cache); -APT_DEPRECATED_MSG("Use APT::Upgrade::Upgrade() instead") bool pkgAllUpgrade(pkgDepCache &Cache); - bool pkgMinimizeUpgrade(pkgDepCache &Cache); #endif diff --git a/debian/libapt-pkg6.0.symbols b/debian/libapt-pkg6.0.symbols index fc9ed3b4b..a6d1be62f 100644 --- a/debian/libapt-pkg6.0.symbols +++ b/debian/libapt-pkg6.0.symbols @@ -48,8 +48,6 @@ libapt-pkg.so.6.0 libapt-pkg6.0 #MINVER# (c++)"pkgPrioSortList(pkgCache&, pkgCache::Version**)@APTPKG_6.0" 0.8.0 (c++)"pkgMakeStatusCache(pkgSourceList&, OpProgress&, MMap**, bool)@APTPKG_6.0" 0.8.0 (c++)"pkgMinimizeUpgrade(pkgDepCache&)@APTPKG_6.0" 0.8.0 - (c++)"pkgAllUpgrade(pkgDepCache&)@APTPKG_6.0" 0.8.0 - (c++)"pkgDistUpgrade(pkgDepCache&)@APTPKG_6.0" 0.8.0 (c++)"GetListOfFilesInDir(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, bool const&)@APTPKG_6.0" 0.8.0 (c++)"GetListOfFilesInDir(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool const&, bool const&)@APTPKG_6.0" 0.8.0 (c++)"pkgMakeOnlyStatusCache(OpProgress&, DynamicMMap**)@APTPKG_6.0" 0.8.0 |