From da18eb10188a22fc1698a9b8466272f2826447db Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Wed, 26 Feb 2020 14:04:51 +0100
Subject: Drop pkgAcquire::Item::ModifyRetries() ABI hack

---
 apt-pkg/acquire-item.cc   | 10 ++--------
 apt-pkg/acquire-item.h    |  5 +++--
 apt-pkg/acquire-worker.cc |  4 ++--
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 3e6436114..9b13a2483 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -290,9 +290,8 @@ public:
    std::vector<std::string> BadAlternativeSites;
    std::vector<std::string> PastRedirections;
    std::unordered_map<std::string, std::string> CustomFields;
-   unsigned int Retries;
 
-   Private() : Retries(_config->FindI("Acquire::Retries", 0))
+   Private()
    {
    }
 };
@@ -771,7 +770,7 @@ class APT_HIDDEN CleanupItem : public pkgAcqTransactionItem		/*{{{*/
 // Acquire::Item::Item - Constructor					/*{{{*/
 pkgAcquire::Item::Item(pkgAcquire * const owner) :
    FileSize(0), PartialSize(0), ID(0), Complete(false), Local(false),
-    QueueCounter(0), ExpectedAdditionalItems(0), Owner(owner), d(new Private())
+    QueueCounter(0), ExpectedAdditionalItems(0), Retries(_config->FindI("Acquire::Retries", 0)), Owner(owner), d(new Private())
 {
    Owner->Add(this);
    Status = StatIdle;
@@ -843,11 +842,6 @@ void pkgAcquire::Item::RemoveAlternativeSite(std::string &&OldSite) /*{{{*/
    d->BadAlternativeSites.push_back(std::move(OldSite));
 }
 									/*}}}*/
-unsigned int &pkgAcquire::Item::ModifyRetries() /*{{{*/
-{
-   return d->Retries;
-}
-									/*}}}*/
 std::string pkgAcquire::Item::ShortDesc() const				/*{{{*/
 {
    return DescURI();
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 7d23d89f8..d3f1bddf8 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -152,6 +152,9 @@ class pkgAcquire::Item : public WeakPointable				/*{{{*/
     */
    std::string DestFile;
 
+   /** \brief Number of retries */
+   unsigned int Retries;
+
    /** \brief Invoked by the acquire worker when the object couldn't
     *  be fetched.
     *
@@ -231,8 +234,6 @@ class pkgAcquire::Item : public WeakPointable				/*{{{*/
     *  no trailing newline.
     */
    virtual std::string Custom600Headers() const;
-   // Retries should really be a member of the Item, but can't be for ABI reasons
-   APT_HIDDEN unsigned int &ModifyRetries();
    // this is more a hack than a proper external interface, hence hidden
    APT_HIDDEN std::unordered_map<std::string, std::string> &ModifyCustomFields();
    // this isn't the super nicest interface either…
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 32fcde181..eff79215d 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -607,9 +607,9 @@ void pkgAcquire::Worker::HandleFailure(std::vector<pkgAcquire::Item *> const &It
    for (auto const Owner : ItmOwners)
    {
       std::string NewURI;
-      if (errTransient == true && Config->LocalOnly == false && Owner->ModifyRetries() != 0)
+      if (errTransient == true && Config->LocalOnly == false && Owner->Retries != 0)
       {
-	 --Owner->ModifyRetries();
+	 --Owner->Retries;
 	 Owner->FailMessage(Message);
 	 auto SavedDesc = Owner->GetItemDesc();
 	 if (Log != nullptr)
-- 
cgit v1.2.3