summaryrefslogtreecommitdiff
path: root/apt-pkg/acquire.cc
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.cc
parent4935c8af8acd8856211c0a527bf4dec4dace0d08 (diff)
parente1024dc0acf72b9615c0821f005364543775a58a (diff)
Merge branch 'pu/abi6'
Diffstat (limited to 'apt-pkg/acquire.cc')
-rw-r--r--apt-pkg/acquire.cc30
1 files changed, 2 insertions, 28 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 541785b03..295af6eca 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -127,25 +127,6 @@ static bool SetupAPTPartialDirectory(std::string const &grand, std::string const
return true;
}
-bool pkgAcquire::Setup(pkgAcquireStatus *Progress, string const &Lock)
-{
- Log = Progress;
- if (Lock.empty())
- {
- string const listDir = _config->FindDir("Dir::State::lists");
- if (SetupAPTPartialDirectory(_config->FindDir("Dir::State"), listDir, "partial", 0700) == false)
- return _error->Errno("Acquire", _("List directory %s is missing."), (listDir + "partial").c_str());
- if (SetupAPTPartialDirectory(_config->FindDir("Dir::State"), listDir, "auxfiles", 0755) == false)
- {
- // not being able to create lists/auxfiles isn't critical as we will use a tmpdir then
- }
- string const archivesDir = _config->FindDir("Dir::Cache::Archives");
- if (SetupAPTPartialDirectory(_config->FindDir("Dir::Cache"), archivesDir, "partial", 0700) == false)
- return _error->Errno("Acquire", _("Archives directory %s is missing."), (archivesDir + "partial").c_str());
- return true;
- }
- return GetLock(Lock);
-}
bool pkgAcquire::GetLock(std::string const &Lock)
{
if (Lock.empty() == true)
@@ -1444,9 +1425,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 +1444,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)