apt-pkg/acquire-item.cc: always init Verify

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index d0fbf948faeef519bf77bcf6f8b43a748bfe24d8..d8fa1f828c6a4186b987736d3a5ae64e1d143810 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -808,8 +808,12 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, IndexTarget const *Target,
    if (CompressionExtension.empty() == false)
       CompressionExtension.erase(CompressionExtension.end()-1);
 
    if (CompressionExtension.empty() == false)
       CompressionExtension.erase(CompressionExtension.end()-1);
 

+   // only verify non-optional targets, see acquire-item.h for a FIXME
+   // to make this more flexible

    if (Target->IsOptional())
      Verify = false;
    if (Target->IsOptional())
      Verify = false;

+   else
+     Verify = true;

 
    Init(Target->URI, Target->Description, Target->ShortDesc);
 }
 
    Init(Target->URI, Target->Description, Target->ShortDesc);
 }

diff --git a/debian/changelog b/debian/changelog
index f0c0790fb10049c2167585b3502d3ef321241005..c4197721f594ebcafad562a84fed793d007768da 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.8.16~exp5) UNRELEASEDexperimental; urgency=low
+apt (0.8.16~exp5) experimental; urgency=low

 
   * apt-pkg/makefile:
     - install sha256.h compat header
 
   * apt-pkg/makefile:
     - install sha256.h compat header


@@ -11,7 +11,7 @@ apt (0.8.16~exp5) UNRELEASEDexperimental; urgency=low
     - do not check for a "Package" tag in optional index targets
       like the translations index
 
     - do not check for a "Package" tag in optional index targets
       like the translations index
 

- -- Michael Vogt <mvo@debian.org>  Fri, 05 Aug 2011 09:11:42 +0200
+ -- Michael Vogt <mvo@debian.org>  Fri, 05 Aug 2011 10:57:08 +0200

 
 apt (0.8.16~exp4) experimental; urgency=low
 
 
 apt (0.8.16~exp4) experimental; urgency=low