summaryrefslogtreecommitdiff
path: root/methods
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2013-03-15 14:29:46 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2013-03-15 14:29:46 +0100
commit99ed26d32226f0dffe5a37fb78c5588f9d9ecfd5 (patch)
treed45910c553d7443d046d976941859a7e8f362f5d /methods
parent2f5b615169aef2d9c74bb337af229dee2dce595e (diff)
* 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
Diffstat (limited to 'methods')
-rw-r--r--methods/gpgv.cc14
1 files changed, 1 insertions, 13 deletions
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");