From a969efb944ef9425b4b6a7b5cfe9104607f4f7ff Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 26 Feb 2019 12:59:27 +0100 Subject: indexcopy: Remove deprecated SigVerify::RunGPGV() --- apt-pkg/indexcopy.cc | 10 ---------- apt-pkg/indexcopy.h | 5 ----- 2 files changed, 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 &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 &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 &SigList, std::vector PkgList,std::vector 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(); }; -- cgit v1.2.3-18-g5258