summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-01-05 21:11:29 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2006-01-05 21:11:29 +0000
commitf381d68d3c1de8e96dfb2a2ebe36c8577729ec44 (patch)
treedd3fbe4a693d77ab43dbb082337bf15346586551
parent8ccc92629a274f8ee3ff38531dfc1e954bfa6506 (diff)
* be more clever about I-M-S hits for the Release file and gpg-failures with it, requeue it without i-m-s then
-rw-r--r--apt-pkg/acquire-item.cc27
-rw-r--r--apt-pkg/acquire-item.h1
-rw-r--r--debian/changelog1
3 files changed, 27 insertions, 2 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 1c5866a4a..b9fc74456 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -430,7 +430,7 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner,
const vector<struct IndexTarget*>* IndexTargets,
indexRecords* MetaIndexParser) :
Item(Owner), RealURI(URI), SigFile(SigFile), AuthPass(false),
- MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets)
+ MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets), IMSHit(false)
{
DestFile = _config->FindDir("Dir::State::lists") + "partial/";
DestFile += URItoFileName(URI);
@@ -523,6 +523,9 @@ void pkgAcqMetaIndex::RetrievalDone(string Message)
return;
}
+ // see if the download was a IMSHit
+ IMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false);
+
Complete = true;
string FinalFile = _config->FindDir("Dir::State::lists");
@@ -688,10 +691,30 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
{
if (AuthPass == true)
{
- // gpgv method failed
+ // if we fail the authentication but got the file via a IMS-Hit
+ // this means that the file wasn't downloaded and that it might be
+ // just stale (server problem, proxy etc). we delete what we have
+ // queue it again without i-m-s
+ // alternatively we could just unlink the file and let the user try again
+ if (IMSHit)
+ {
+ Complete = false;
+ Local = false;
+ AuthPass = false;
+ unlink(DestFile.c_str());
+
+ DestFile = _config->FindDir("Dir::State::lists") + "partial/";
+ DestFile += URItoFileName(RealURI);
+ Desc.URI = RealURI;
+ QueueURI(Desc);
+ return;
+ }
+
+ // gpgv method failed
_error->Warning("GPG error: %s: %s",
Desc.Description.c_str(),
LookupTag(Message,"Message").c_str());
+
}
// No Release file was present, or verification failed, so fall
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index c34b5ef69..e6fc7fc47 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -151,6 +151,7 @@ class pkgAcqMetaIndex : public pkgAcquire::Item
const vector<struct IndexTarget*>* IndexTargets;
indexRecords* MetaIndexParser;
bool AuthPass;
+ bool IMSHit; // required to fail gracefully on failures
bool VerifyVendor();
void RetrievalDone(string Message);
diff --git a/debian/changelog b/debian/changelog
index e6681c480..5c1b1347e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ apt (0.6.43.1) unstable; urgency=low
* apt-get source won't download already downloaded files again
(closes: #79277)
* share/debian-archive.gpg: new 2006 ftp-archive signing key added
+ * redownload the Release file if IMS-Hit and gpg failure
--