summaryrefslogtreecommitdiff
path: root/methods
diff options
context:
space:
mode:
authorbubulle@debian.org <>2006-05-10 20:27:12 +0200
committerbubulle@debian.org <>2006-05-10 20:27:12 +0200
commitfa7733bcf513215a5e8cbd6d9be3d867444b5f1e (patch)
treedaf6265a900f471c65c411b89e195808228ab90e /methods
parent7bbc5183958e2cb5989a45ba3bf04eacd07c6534 (diff)
parent41ca14b3108dbb7b01d1adceee857b52bc955bd5 (diff)
Sync with Michael
Diffstat (limited to 'methods')
-rw-r--r--methods/ftp.cc7
-rw-r--r--methods/gpgv.cc30
2 files changed, 23 insertions, 14 deletions
diff --git a/methods/ftp.cc b/methods/ftp.cc
index f595e0ca4..0c2aa00a7 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1055,9 +1055,12 @@ bool FtpMethod::Fetch(FetchItem *Itm)
UBuf.modtime = FailTime;
utime(FailFile.c_str(),&UBuf);
- // If the file is missing we hard fail otherwise transient fail
- if (Missing == true)
+ // If the file is missing we hard fail and delete the destfile
+ // otherwise transient fail
+ if (Missing == true) {
+ unlink(FailFile.c_str());
return false;
+ }
Fail(true);
return true;
}
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index a114ad797..ba7389cba 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -11,6 +11,7 @@
#include <errno.h>
#include <sys/wait.h>
#include <iostream>
+#include <sstream>
#define GNUPGPREFIX "[GNUPG:]"
#define GNUPGBADSIG "[GNUPG:] BADSIG"
@@ -20,7 +21,7 @@
class GPGVMethod : public pkgAcqMethod
{
private:
- const char *VerifyGetSigners(const char *file, const char *outfile,
+ string VerifyGetSigners(const char *file, const char *outfile,
vector<string> &GoodSigners, vector<string> &BadSigners,
vector<string> &NoPubKeySigners);
@@ -32,11 +33,15 @@ class GPGVMethod : public pkgAcqMethod
GPGVMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {};
};
-const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
+string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
vector<string> &GoodSigners,
vector<string> &BadSigners,
vector<string> &NoPubKeySigners)
{
+ // setup a (empty) stringstream for formating the return value
+ std::stringstream ret;
+ ret.str("");
+
if (_config->FindB("Debug::Acquire::gpgv", false))
{
std::cerr << "inside VerifyGetSigners" << std::endl;
@@ -54,9 +59,11 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
std::cerr << "Keyring path: " << pubringpath << std::endl;
}
- if (stat(pubringpath.c_str(), &buff) != 0)
- return (string("Couldn't access keyring: ") + strerror(errno)).c_str();
-
+ if (stat(pubringpath.c_str(), &buff) != 0)
+ {
+ ioprintf(ret, _("Couldn't access keyring: '%s'"), strerror(errno));
+ return ret.str();
+ }
if (pipe(fd) < 0)
{
return "Couldn't create pipe";
@@ -65,7 +72,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
pid = fork();
if (pid < 0)
{
- return (string("Couldn't spawn new process") + strerror(errno)).c_str();
+ return string("Couldn't spawn new process") + strerror(errno);
}
else if (pid == 0)
{
@@ -189,7 +196,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
{
if (GoodSigners.empty())
return _("Internal error: Good signature, but could not determine key fingerprint?!");
- return NULL;
+ return "";
}
else if (WEXITSTATUS(status) == 1)
{
@@ -197,9 +204,8 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
}
else if (WEXITSTATUS(status) == 111)
{
- // FIXME String concatenation considered harmful.
- return (string(_("Could not execute ")) + gpgvpath +
- string(_(" to verify signature (is gnupg installed?)"))).c_str();
+ ioprintf(ret, _("Could not execute '%s' to verify signature (is gnupg installed?)"), gpgvpath.c_str());
+ return ret.str();
}
else
{
@@ -221,8 +227,8 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
URIStart(Res);
// Run gpgv on file, extract contents and get the key ID of the signer
- const char *msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(),
- GoodSigners, BadSigners, NoPubKeySigners);
+ string msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(),
+ GoodSigners, BadSigners, NoPubKeySigners);
if (GoodSigners.empty() || !BadSigners.empty() || !NoPubKeySigners.empty())
{
string errmsg;