summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/acquire.cc19
-rw-r--r--apt-pkg/acquire.h14
-rw-r--r--debian/libapt-pkg6.0.symbols1
3 files changed, 0 insertions, 34 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index fc256b39e..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)
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 0b7b34d54..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
diff --git a/debian/libapt-pkg6.0.symbols b/debian/libapt-pkg6.0.symbols
index f2107e24e..185f48507 100644
--- a/debian/libapt-pkg6.0.symbols
+++ b/debian/libapt-pkg6.0.symbols
@@ -1002,7 +1002,6 @@ libapt-pkg.so.6.0 libapt-pkg6.0 #MINVER#
(c++)"pkgAcquire::Item::Dequeue()@APTPKG_6.0" 1.1~exp4
(c++)"pkgAcquire::Item::QueueURI(pkgAcquire::ItemDesc&)@APTPKG_6.0" 1.1~exp4
(c++)"pkgAcquire::Item::SetActiveSubprocess(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_6.0" 1.1~exp4
- (c++)"pkgAcquire::Setup(pkgAcquireStatus*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_6.0" 1.1~exp4
(c++)"pkgDepCache::MarkAndSweep()@APTPKG_6.0" 1.1~exp4
(c++)"pkgDepCache::MarkAndSweep(pkgDepCache::InRootSetFunc&)@APTPKG_6.0" 1.1~exp4
### mixed stuff