summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2019-02-26 12:59:27 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2019-02-26 16:31:20 +0100
commita969efb944ef9425b4b6a7b5cfe9104607f4f7ff (patch)
tree0137a3118cc0932c0ad38ad1ba6091b4b485fc8b
parentf53a120320cd09d572658d424badc5485f1b9182 (diff)
indexcopy: Remove deprecated SigVerify::RunGPGV()
-rw-r--r--apt-pkg/indexcopy.cc10
-rw-r--r--apt-pkg/indexcopy.h5
2 files changed, 0 insertions, 15 deletions
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 41cecdec1..9fa9361a3 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -640,16 +640,6 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
return true;
}
/*}}}*/
-// SigVerify::RunGPGV - deprecated wrapper calling ExecGPGV /*{{{*/
-APT_NORETURN bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut,
- int const &statusfd, int fd[2]) {
- ExecGPGV(File, FileOut, statusfd, fd);
-}
-APT_NORETURN bool SigVerify::RunGPGV(std::string const &File, std::string const &FileOut,
- int const &statusfd) {
- ExecGPGV(File, FileOut, statusfd);
-}
- /*}}}*/
bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/
vector<string> &List, pkgCdromStatus *log)
{
diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index dc3b985a2..8dfd68d9a 100644
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -116,11 +116,6 @@ class SigVerify /*{{{*/
bool CopyAndVerify(std::string CDROM,std::string Name,std::vector<std::string> &SigList,
std::vector<std::string> PkgList,std::vector<std::string> SrcList);
- APT_DEPRECATED_MSG("Use ExecGPGV instead") static bool RunGPGV(std::string const &File, std::string const &FileOut,
- int const &statusfd, int fd[2]);
- APT_DEPRECATED_MSG("Use ExecGPGV instead") static bool RunGPGV(std::string const &File, std::string const &FileOut,
- int const &statusfd = -1);
-
SigVerify();
virtual ~SigVerify();
};