From 2f5b615169aef2d9c74bb337af229dee2dce595e Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Fri, 15 Mar 2013 14:17:01 +0100
Subject: * apt-pkg/indexcopy.cc:   - rename RunGPGV to ExecGPGV and move it to
 apt-pkg/contrib/gpgv.cc

---
 methods/gpgv.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'methods')

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 25ba0d063..98381b845 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -6,6 +6,7 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/indexcopy.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/gpgv.h>
 
 #include <utime.h>
 #include <stdio.h>
@@ -72,7 +73,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
    else if (pid == 0)
    {
       _error->PushToStack();
-      bool const success = SigVerify::RunGPGV(outfile, file, 3, fd);
+      bool const success = ExecGPGV(outfile, file, 3, fd);
       if (success == false)
       {
 	 string errmsg;
-- 
cgit v1.2.3


From 99ed26d32226f0dffe5a37fb78c5588f9d9ecfd5 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Fri, 15 Mar 2013 14:29:46 +0100
Subject: * apt-pkg/contrib/gpgv.cc:   - ExecGPGV is a method which should
 never return, so mark it as such     and fix the inconsistency of returning
 in error cases

---
 methods/gpgv.cc | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'methods')

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 98381b845..3f814b9f0 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -71,19 +71,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
    if (pid < 0)
       return string("Couldn't spawn new process") + strerror(errno);
    else if (pid == 0)
-   {
-      _error->PushToStack();
-      bool const success = ExecGPGV(outfile, file, 3, fd);
-      if (success == false)
-      {
-	 string errmsg;
-	 _error->PopMessage(errmsg);
-	 _error->RevertToStack();
-	 return errmsg;
-      }
-      _error->RevertToStack();
-      exit(111);
-   }
+      ExecGPGV(outfile, file, 3, fd);
    close(fd[1]);
 
    FILE *pipein = fdopen(fd[0], "r");
-- 
cgit v1.2.3