test/integration/test-ubuntu-bug-346386-apt-get-update-paywall: use downloadfile()

[apt.git] / methods / gpgv.cc

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 3f814b9f0aa5c394bca23ecc87e3c0ece12bfaee..ae521a2edbd6d831e6a1ecf52d20f080f306133a 100644 (file)
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -1,20 +1,21 @@
 #include <config.h>
 
 #include <config.h>
 

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

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

-#include <apt-pkg/strutl.h>
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/indexcopy.h>

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

+#include <apt-pkg/error.h>

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

+#include <apt-pkg/strutl.h>

 
 

-#include <utime.h>
-#include <stdio.h>
-#include <fcntl.h>
+#include <ctype.h>

 #include <errno.h>
 #include <errno.h>

+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>

 #include <sys/wait.h>
 #include <sys/wait.h>

+#include <unistd.h>

 #include <iostream>
 #include <iostream>

-#include <sstream>
+#include <string>

 #include <vector>
 
 #include <apti18n.h>
 #include <vector>
 
 #include <apti18n.h>


@@ -55,9 +56,6 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
                                         vector<string> &NoPubKeySigners)
 {
    bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);
                                         vector<string> &NoPubKeySigners)
 {
    bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);

-   // setup a (empty) stringstream for formating the return value
-   std::stringstream ret;
-   ret.str("");

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


@@ -155,6 +153,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       }
    }
    fclose(pipein);
       }
    }
    fclose(pipein);

+   free(buffer);

 
    int status;
    waitpid(pid, &status, 0);
 
    int status;
    waitpid(pid, &status, 0);


@@ -170,18 +169,19 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       return "";
    }
    else if (WEXITSTATUS(status) == 1)
       return "";
    }
    else if (WEXITSTATUS(status) == 1)

-   {

       return _("At least one invalid signature was encountered.");
       return _("At least one invalid signature was encountered.");

-   }

    else if (WEXITSTATUS(status) == 111)
    else if (WEXITSTATUS(status) == 111)

+      return _("Could not execute 'gpgv' to verify signature (is gpgv installed?)");
+   else if (WEXITSTATUS(status) == 112)

    {
    {

-      ioprintf(ret, _("Could not execute 'gpgv' to verify signature (is gpgv installed?)"));
-      return ret.str();
+      // acquire system checks for "NODATA" to generate GPG errors (the others are only warnings)
+      std::string errmsg;
+      //TRANSLATORS: %s is a single techy word like 'NODATA'
+      strprintf(errmsg, _("Clearsigned file isn't valid, got '%s' (does the network require authentication?)"), "NODATA");
+      return errmsg;

    }
    else
    }
    else

-   {

       return _("Unknown error executing gpgv");
       return _("Unknown error executing gpgv");

-   }

 }
 
 bool GPGVMethod::Fetch(FetchItem *Itm)
 }
 
 bool GPGVMethod::Fetch(FetchItem *Itm)