* 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)

diff --combined apt-pkg/acquire-item.cc
index 54526ab058909a1032419a74ba010b1b4c9c423f,fa48eeae933abc5c0ca0aef93995c1fd1a316c79..ad48adcffa2aabe51e0c758ca977a48e7e05e555
--- 1/apt-pkg/acquire-item.cc
--- 2/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@@ -935,6 -935,9 +935,9 @@@ void pkgAcqMetaIndex::Done(string Messa
     else
     {
        RetrievalDone(Message);
+       if (!Complete)
+          // Still more retrieving to do
+          return;
  
        if (SigFile == "")
        {
@@@ -987,6 -990,7 +990,7 @@@ void pkgAcqMetaIndex::RetrievalDone(str
        FinalFile += URItoFileName(RealURI);
        DestFile = FinalFile;
     }
+    Complete = true;
  }
  
  void pkgAcqMetaIndex::AuthDone(string Message)
@@@ -1172,7 -1176,7 +1176,7 @@@ void pkgAcqMetaIndex::Failed(string Mes
         _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;