summaryrefslogtreecommitdiff
path: root/apt-pkg/acquire.h
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2019-02-26 16:31:25 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2019-02-26 16:31:25 +0100
commit3b13b8a0b79d625d2913518529a34e92b4f41539 (patch)
tree404745c04c1eb4548bd6151034229c98d97d36f6 /apt-pkg/acquire.h
parent4935c8af8acd8856211c0a527bf4dec4dace0d08 (diff)
parente1024dc0acf72b9615c0821f005364543775a58a (diff)
Merge branch 'pu/abi6'
Diffstat (limited to 'apt-pkg/acquire.h')
-rw-r--r--apt-pkg/acquire.h28
1 files changed, 1 insertions, 27 deletions
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 1cf4da5bf..4d564daf5 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -353,20 +353,6 @@ class pkgAcquire
*/
unsigned long long PartialPresent();
- /** \brief Delayed constructor
- *
- * \param Progress indicator associated with this download or
- * \b NULL for none. This object is not owned by the
- * download process and will not be deleted when the pkgAcquire
- * object is destroyed. Naturally, it should live for at least as
- * long as the pkgAcquire object does.
- * \param Lock defines a lock file that should be acquired to ensure
- * only one Acquire class is in action at the time or an empty string
- * if no lock file should be used. If set also all needed directories
- * will be created.
- */
- APT_DEPRECATED_MSG("Use constructors, .SetLog and .GetLock as needed") bool Setup(pkgAcquireStatus *Progress = NULL, std::string const &Lock = "");
-
void SetLog(pkgAcquireStatus *Progress) { Log = Progress; }
/** \brief acquire lock and perform directory setup
@@ -819,17 +805,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 +854,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();
-};
/*}}}*/
/** @} */