summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <egon@debian-devbox>2011-08-05 11:00:46 +0200
committerMichael Vogt <egon@debian-devbox>2011-08-05 11:00:46 +0200
commit97efc27f0723f09405d7a1836ab21c2e2948eb10 (patch)
treeef363ac90292c323813295b381329f7af0914de3
parentc5f661b715fbd86fcbca694c44bb8422f01db267 (diff)
apt-pkg/acquire-item.cc: always init Verify
-rw-r--r--apt-pkg/acquire-item.cc4
-rw-r--r--debian/changelog4
2 files changed, 6 insertions, 2 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index d0fbf948f..d8fa1f828 100644
--- 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);
+ // only verify non-optional targets, see acquire-item.h for a FIXME
+ // to make this more flexible
if (Target->IsOptional())
Verify = false;
+ else
+ Verify = true;
Init(Target->URI, Target->Description, Target->ShortDesc);
}
diff --git a/debian/changelog b/debian/changelog
index f0c0790fb..c4197721f 100644
--- 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
@@ -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
- -- 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