apt-key: warn instead of fail on unreadable keyrings

[apt.git] / methods / gpgv.cc

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index dd395d6598c8fb34d3327b0307810e9ac68b7c57..2fed53a39c2147f2ef14b657ef9ae764810fb6c1 100644 (file)
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -1,6 +1,5 @@
 #include <config.h>
 
 #include <config.h>
 

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/gpgv.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/gpgv.h>


@@ -148,7 +147,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
                                         vector<Signer> &SoonWorthlessSigners,
                                         vector<string> &NoPubKeySigners)
 {
                                         vector<Signer> &SoonWorthlessSigners,
                                         vector<string> &NoPubKeySigners)
 {

-   bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);
+   bool const Debug = DebugEnabled();

 
    if (Debug == true)
       std::clog << "inside VerifyGetSigners" << std::endl;
 
    if (Debug == true)
       std::clog << "inside VerifyGetSigners" << std::endl;


@@ -416,10 +415,8 @@ bool GPGVMethod::URIAcquire(std::string const &Message, FetchItem *Itm)
    std::move(NoPubKeySigners.begin(), NoPubKeySigners.end(), std::back_inserter(Res.GPGVOutput));
    URIDone(Res);
 
    std::move(NoPubKeySigners.begin(), NoPubKeySigners.end(), std::back_inserter(Res.GPGVOutput));
    URIDone(Res);
 

-   if (_config->FindB("Debug::Acquire::gpgv", false))
-   {
+   if (DebugEnabled())

       std::clog << "apt-key succeeded\n";
       std::clog << "apt-key succeeded\n";

-   }

 
    return true;
 }
 
    return true;
 }


@@ -427,9 +424,5 @@ bool GPGVMethod::URIAcquire(std::string const &Message, FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

-   setlocale(LC_ALL, "");
-
-   GPGVMethod Mth;
-
-   return Mth.Run();
+   return GPGVMethod().Run();

 }
 }