reintroduce #clear and #include in the config files,

[apt.git] / apt-pkg / acquire-item.cc

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 94341c81a93f47ac6e227d4eabbad7b74dadf57d..afb3daad391347e8cef3586ccb67e25b26dcd810 100644 (file)
--- 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;
 
       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++;
       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/
    }
 
    // on decompression failure, remove bad versions in partial/