diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 13:20:21 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 16:31:20 +0100 |
| commit | 30d563c7a7ac68a0d2c1e765a1a43687d406c0d5 (patch) | |
| tree | 2542b69cf0550fbd97b07ec6fc135be0127f303a /apt-pkg | |
| parent | 36adf6dd0504d7b280e93f5206d93ee5f7f13e84 (diff) | |
sourceslist: Remove deprecated AddVolatileFiles() variant
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/sourcelist.cc | 17 | ||||
| -rw-r--r-- | apt-pkg/sourcelist.h | 1 |
2 files changed, 0 insertions, 18 deletions
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 5be8fbc0c..eef4d8a7f 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -623,21 +623,4 @@ void pkgSourceList::AddVolatileFiles(CommandLine &CmdL, std::vector<std::string> return false; }); } -void pkgSourceList::AddVolatileFiles(CommandLine &CmdL, std::vector<const char*> * const VolatileCmdL) -{ - std::remove_if(CmdL.FileList + 1, CmdL.FileList + 1 + CmdL.FileSize(), [&](char const * const I) { - if (I != nullptr && (I[0] == '/' || (I[0] == '.' && (I[1] == '\0' || (I[1] == '.' && (I[2] == '\0' || I[2] == '/')) || I[1] == '/')))) - { - if (AddVolatileFile(I)) - { - if (VolatileCmdL != nullptr) - VolatileCmdL->push_back(I); - } - else - _error->Error(_("Unsupported file %s given on commandline"), I); - return true; - } - return false; - }); -} /*}}}*/ diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index fedf90fa6..255c99868 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -131,7 +131,6 @@ class pkgSourceList void AddVolatileFile(pkgIndexFile * const File); bool AddVolatileFile(std::string const &File); bool AddVolatileFile(std::string const &File, std::vector<std::string> * const VolatileCmdL); - APT_DEPRECATED_MSG("Use the overload with string-vector") void AddVolatileFiles(CommandLine &CmdL, std::vector<const char*> * const VolatileCmdL); void AddVolatileFiles(CommandLine &CmdL, std::vector<std::string> * const VolatileCmdL); /** @return list of files registered with #AddVolatileFile */ |