summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire.cc11
-rw-r--r--apt-pkg/acquire.h14
2 files changed, 3 insertions, 22 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 541785b03..fc256b39e 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -1444,9 +1444,8 @@ void pkgAcquireStatus::Fetched(unsigned long long Size,unsigned long long Resume
/*}}}*/
bool pkgAcquireStatus::ReleaseInfoChanges(metaIndex const * const LastRelease, metaIndex const * const CurrentRelease, std::vector<ReleaseInfoChange> &&Changes)/*{{{*/
{
- auto const virt = dynamic_cast<pkgAcquireStatus2*>(this);
- if (virt != nullptr)
- return virt->ReleaseInfoChanges(LastRelease, CurrentRelease, std::move(Changes));
+ (void) LastRelease;
+ (void) CurrentRelease;
return ReleaseInfoChangesAsGlobalErrors(std::move(Changes));
}
/*}}}*/
@@ -1464,12 +1463,6 @@ bool pkgAcquireStatus::ReleaseInfoChangesAsGlobalErrors(std::vector<ReleaseInfoC
return AllOkay;
}
/*}}}*/
-bool pkgAcquireStatus2::ReleaseInfoChanges(metaIndex const * const, metaIndex const * const, std::vector<ReleaseInfoChange> &&Changes)
-{
- return ReleaseInfoChangesAsGlobalErrors(std::move(Changes));
-}
-pkgAcquireStatus2::pkgAcquireStatus2() : pkgAcquireStatus() {}
-pkgAcquireStatus2::~pkgAcquireStatus2() {}
pkgAcquire::UriIterator::UriIterator(pkgAcquire::Queue *Q) : d(NULL), CurQ(Q), CurItem(0)
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 1cf4da5bf..0b7b34d54 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -819,17 +819,13 @@ class pkgAcquireStatus
* success it will print for each change the message attached to it via GlobalError either as an
* error (if DefaultAction == false) or as a notice otherwise.
*
- * \b Note: To keep ABI compatibility for now this method isn't marked as
- * virtual, but you can derive your class from #pkgAcquireStatus2 which has it
- * marked as virtual. TODO on next ABI break: merge both classes.
- *
* @param LastRelease can be used to extract further information from the previous Release file
* @param CurrentRelease can be used to extract further information from the current Release file
* @param Changes is an array of changes alongside explanatory messages
* which should be presented in some way to the user.
* @return \b true if all changes are accepted by user, otherwise or if user can't be asked \b false
*/
- bool ReleaseInfoChanges(metaIndex const * const LastRelease, metaIndex const * const CurrentRelease, std::vector<ReleaseInfoChange> &&Changes);
+ virtual bool ReleaseInfoChanges(metaIndex const * const LastRelease, metaIndex const * const CurrentRelease, std::vector<ReleaseInfoChange> &&Changes);
APT_HIDDEN static bool ReleaseInfoChangesAsGlobalErrors(std::vector<ReleaseInfoChange> &&Changes);
/** \brief Invoked when an item is confirmed to be up-to-date.
@@ -872,14 +868,6 @@ class pkgAcquireStatus
pkgAcquireStatus();
virtual ~pkgAcquireStatus();
};
-class pkgAcquireStatus2: public pkgAcquireStatus
-{
-public:
- virtual bool ReleaseInfoChanges(metaIndex const * const LastRelease, metaIndex const * const CurrentRelease, std::vector<ReleaseInfoChange> &&Changes);
-
- pkgAcquireStatus2();
- virtual ~pkgAcquireStatus2();
-};
/*}}}*/
/** @} */