summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2008-01-02 14:04:11 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2008-01-02 14:04:11 +0100
commit76b8e5a572455fd7360d346a6c70428b1cb5de43 (patch)
tree741f795016742e1658708877cbe44752348988f2 /apt-pkg
parentfce726023f703c369ae030684e75ed03c7544d6b (diff)
parentf3224a73ec718a5f4e4404cd716e4b7c2702bb8b (diff)
* test/authReliability/sources.list.good:
- add missing file to make the tests work again * apt-pkg/acquire-item.cc: - fix I-M-S hits with file:// uris * test/pre-upload-check.py: - better error messages - use "apt-get" by default (instead of ../bin/apt-get)
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire-item.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 54526ab05..ad48adcff 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -935,6 +935,9 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash,
else
{
RetrievalDone(Message);
+ if (!Complete)
+ // Still more retrieving to do
+ return;
if (SigFile == "")
{
@@ -987,6 +990,7 @@ void pkgAcqMetaIndex::RetrievalDone(string Message)
FinalFile += URItoFileName(RealURI);
DestFile = FinalFile;
}
+ Complete = true;
}
void pkgAcqMetaIndex::AuthDone(string Message)
@@ -1172,7 +1176,7 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
_error->Warning(_("A error occurred during the signature "
"verification. The repository is not updated "
"and the previous index files will be used."
- "GPG error: %s: %s\n"
+ "GPG error: %s: %s\n"),
Desc.Description.c_str(),
LookupTag(Message,"Message").c_str());
return;