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

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)