summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2025-02-03 15:31:47 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2025-02-07 20:59:42 +0100
commit52d0baba388a21205b323153a0d83dc6ae75bbf0 (patch)
tree5e4a4db1aa5ad5d78b643585522bc1520b30ee84 /apt-pkg
parenta186a14bdc914a0d12130b55f1f62c179c7e2086 (diff)
solver3: Drop unused upgrade flag
This was leftover from before the groups were added.
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/solver3.cc4
-rw-r--r--apt-pkg/solver3.h4
2 files changed, 3 insertions, 5 deletions
diff --git a/apt-pkg/solver3.cc b/apt-pkg/solver3.cc
index 73f7fd0c4..42e6fedce 100644
--- a/apt-pkg/solver3.cc
+++ b/apt-pkg/solver3.cc
@@ -222,7 +222,7 @@ void APT::Solver::Work::Dump(pkgCache &cache)
std::cerr << "Erased ";
if (optional)
std::cerr << "Optional ";
- std::cerr << "Item (" << ssize_t(size <= solutions.size() ? size : -1) << "@" << depth << (upgrade ? "u" : "") << ") ";
+ std::cerr << "Item (" << ssize_t(size <= solutions.size() ? size : -1) << "@" << depth << ") ";
if (auto Pkg = reason.Pkg(cache); not Pkg.end())
std::cerr << Pkg.FullName();
if (auto Ver = reason.Ver(cache); not Ver.end())
@@ -1011,7 +1011,7 @@ bool APT::Solver::FromDepCache(pkgDepCache &depcache)
}
else
{
- Work w{Var(), depth(), Group, isOptional, Upgrade};
+ Work w{Var(), depth(), Group, isOptional};
for (auto V = P.VersionList(); not V.end(); ++V)
w.solutions.push_back(V);
std::stable_sort(w.solutions.begin(), w.solutions.end(), CompareProviders3{cache, policy, P, *this});
diff --git a/apt-pkg/solver3.h b/apt-pkg/solver3.h
index 4f6f83d15..282e8865b 100644
--- a/apt-pkg/solver3.h
+++ b/apt-pkg/solver3.h
@@ -291,8 +291,6 @@ struct APT::Solver::Work
// \brief Whether this is an optional work item, they will be processed last
bool optional;
- // \brief Whether this is an ugprade
- bool upgrade;
// \brief This item should be removed from the queue.
bool erased;
@@ -300,7 +298,7 @@ struct APT::Solver::Work
// \brief Dump the work item to std::cerr
void Dump(pkgCache &cache);
- inline Work(Var reason, depth_type depth, Group group, bool optional = false, bool upgrade = false) : reason(reason), depth(depth), group(group), size(0), optional(optional), upgrade(upgrade), erased(false) {}
+ inline Work(Var reason, depth_type depth, Group group, bool optional = false) : reason(reason), depth(depth), group(group), size(0), optional(optional), erased(false) {}
};
// \brief This essentially describes the install state in RFC2119 terms.