summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2019-02-26 12:46:26 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2019-02-26 16:31:20 +0100
commit4514f29a3ce0ef8cfdc9665c99ec64da762f6478 (patch)
tree6853a82f6d18fadf57b5a753f5d8b4a036ff31da
parenta9182c8f789e7d19def3d6e178cb02bd9a46aa24 (diff)
algorithms: Remove deprecated ProblemResolver::InstallProtect()
-rw-r--r--apt-pkg/algorithms.cc26
-rw-r--r--apt-pkg/algorithms.h2
-rw-r--r--debian/libapt-pkg6.0.symbols1
3 files changed, 0 insertions, 29 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index bb0e2f873..4d4adde3c 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1343,32 +1343,6 @@ bool pkgProblemResolver::ResolveByKeepInternal()
return true;
}
/*}}}*/
-// ProblemResolver::InstallProtect - deprecated cpu-eating no-op /*{{{*/
-// ---------------------------------------------------------------------
-/* Actions issued with FromUser bit set are protected from further
- modification (expect by other calls with FromUser set) nowadays , so we
- don't need to reissue actions here, they are already set in stone. */
-void pkgProblemResolver::InstallProtect()
-{
- pkgDepCache::ActionGroup group(Cache);
-
- for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I)
- {
- if ((Flags[I->ID] & Protected) == Protected)
- {
- if ((Flags[I->ID] & ToRemove) == ToRemove)
- Cache.MarkDelete(I);
- else
- {
- // preserve the information whether the package was auto
- // or manually installed
- bool autoInst = (Cache[I].Flags & pkgCache::Flag::Auto);
- Cache.MarkInstall(I, false, 0, !autoInst);
- }
- }
- }
-}
- /*}}}*/
// PrioSortList - Sort a list of versions by priority /*{{{*/
// ---------------------------------------------------------------------
/* This is meant to be used in conjunction with AllTargets to get a list
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index c5c9f4c69..f6a1ce1fb 100644
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -147,8 +147,6 @@ class pkgProblemResolver /*{{{*/
bool ResolveByKeep(OpProgress * const Progress = NULL);
APT_HIDDEN bool ResolveByKeepInternal();
- APT_DEPRECATED_MSG("NOOP as MarkInstall enforces not overriding FromUser markings") void InstallProtect();
-
explicit pkgProblemResolver(pkgDepCache *Cache);
virtual ~pkgProblemResolver();
};
diff --git a/debian/libapt-pkg6.0.symbols b/debian/libapt-pkg6.0.symbols
index 185f48507..01dc3808a 100644
--- a/debian/libapt-pkg6.0.symbols
+++ b/debian/libapt-pkg6.0.symbols
@@ -321,7 +321,6 @@ libapt-pkg.so.6.0 libapt-pkg6.0 #MINVER#
(c++)"pkgPackageManager::DoInstall(int)@APTPKG_6.0" 0.8.0
(c++)"pkgPackageManager::pkgPackageManager(pkgDepCache*)@APTPKG_6.0" 0.8.0
(c++)"pkgPackageManager::~pkgPackageManager()@APTPKG_6.0" 0.8.0
- (c++)"pkgProblemResolver::InstallProtect()@APTPKG_6.0" 0.8.0
(c++)"pkgProblemResolver::pkgProblemResolver(pkgDepCache*)@APTPKG_6.0" 0.8.0
(c++)"pkgProblemResolver::~pkgProblemResolver()@APTPKG_6.0" 0.8.0
(c++)"debVersioningSystem::CmpFragment(char const*, char const*, char const*, char const*)@APTPKG_6.0" 0.8.0