From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 2 Jan 2008 13:04:11 +0000 (+0100)
Subject: * test/authReliability/sources.list.good:
X-Git-Tag: 0.7.24ubuntu1~103^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/76b8e5a572455fd7360d346a6c70428b1cb5de43?hp=-c

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

76b8e5a572455fd7360d346a6c70428b1cb5de43
diff --combined apt-pkg/acquire-item.cc
index 54526ab05,fa48eeae9..ad48adcff
--- a/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;