X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b53c9cea2902572822bbbece5bac236c1bbf846e..90139c7075afb283428d561b81037039bc7ba149:/methods/gpgv.cc diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 490833d8c..f17990245 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -6,6 +6,7 @@ #include #include #include +#include "aptmethod.h" #include #include @@ -35,7 +36,7 @@ using std::vector; #define GNUPGREVKEYSIG "[GNUPG:] REVKEYSIG" #define GNUPGNODATA "[GNUPG:] NODATA" -class GPGVMethod : public pkgAcqMethod +class GPGVMethod : public aptMethod { private: string VerifyGetSigners(const char *file, const char *outfile, @@ -47,22 +48,11 @@ class GPGVMethod : public pkgAcqMethod protected: virtual bool URIAcquire(std::string const &Message, FetchItem *Itm) APT_OVERRIDE; - virtual bool Configuration(string Message) APT_OVERRIDE; public: - GPGVMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {}; + GPGVMethod() : aptMethod("gpgv","1.0",SingleInstance | SendConfig) {}; }; -bool GPGVMethod::Configuration(string Message) -{ - if (pkgAcqMethod::Configuration(Message) == false) - return false; - - DropPrivsOrDie(); - - return true; -} - string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, std::string const &key, vector &GoodSigners,