merge with lp:~mvo/apt/debian-sid with the bugfix release 0.7.23.1 in it.

1 files changed, 13 insertions, 13 deletions

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 94341c81a..afb3daad3 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -596,21 +596,21 @@ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)	/*{{{*/
       if(Desc.URI.substr(nameLen) != *t)
 	 continue;
 
-      // we want to try it with the next extension
+      // we want to try it with the next extension (and make sure to 
+      // not skip over the end)
       t++;
+      if (t == types.end())
+	 break;
 
-      if (t != types.end())
-      {
-	 Desc.URI = Desc.URI.substr(0, nameLen) + *t;
-
-	 new pkgAcqIndex(Owner, RealURI, Desc.Description, Desc.ShortDesc,
-			 ExpectedHash, string(".").append(*t));
-
-	 Status = StatDone;
-	 Complete = false;
-	 Dequeue();
-	 return;
-      }
+      // queue new download
+      Desc.URI = Desc.URI.substr(0, nameLen) + *t;
+      new pkgAcqIndex(Owner, RealURI, Desc.Description, Desc.ShortDesc,
+      ExpectedHash, string(".").append(*t));
+      
+      Status = StatDone;
+      Complete = false;
+      Dequeue();
+      return;
    }
 
    // on decompression failure, remove bad versions in partial/