summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2008-01-02 13:50:56 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2008-01-02 13:50:56 +0100
commitf3224a73ec718a5f4e4404cd716e4b7c2702bb8b (patch)
treeeb482e0dd8bbb81cc26926299747d47421271e05 /apt-pkg
parentfce726023f703c369ae030684e75ed03c7544d6b (diff)
test/authReliability/sources.list.good:
- add missing file to make the test/pre-upload-check.py work again apt-pkg/acquire-item.cc: - fix auth-reliable code when file:// uris are used test/pre-upload-check.py: - use the standard apt, not "../bin/apt-get" by default - make the error messages more useful on test-failure
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire-item.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 54526ab05..fa48eeae9 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)