Don't download "optional" files not in Release :/.

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index f27ef28d31b781fc07dc90585b0f07709aeffa19..82bf8a1eb917a2df2d7c64f0f38bc4d39ecec2b9 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1411,7 +1411,7 @@ void pkgAcqMetaClearSig::QueueIndexes(bool const verify)                  /*{{{*/
         if (TransactionManager->MetaIndexParser->Exists(Target.MetaKey) == false)
         {
            // optional targets that we do not have in the Release file are skipped
         if (TransactionManager->MetaIndexParser->Exists(Target.MetaKey) == false)
         {
            // optional targets that we do not have in the Release file are skipped

-           if (hasHashes == true && Target.IsOptional)
+           if (Target.IsOptional)

            {
               new CleanupItem(Owner, TransactionManager, Target);
               continue;
            {
               new CleanupItem(Owner, TransactionManager, Target);
               continue;


@@ -1535,6 +1535,13 @@ void pkgAcqMetaClearSig::QueueIndexes(bool const verify)                 /*{{{*/
       }
       else
       {
       }
       else
       {

+        // if the source wanted these files they should have given us a release file :/
+        if (Target.IsOptional)
+        {
+           new CleanupItem(Owner, TransactionManager, Target);
+           continue;
+        }
+

         // if we have no file to patch, no point in trying
         trypdiff &= (GetExistingFilename(GetFinalFileNameFromURI(Target.URI)).empty() == false);
       }
         // if we have no file to patch, no point in trying
         trypdiff &= (GetExistingFilename(GetFinalFileNameFromURI(Target.URI)).empty() == false);
       }