summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <egon@debian-devbox>2011-08-05 10:48:18 +0200
committerMichael Vogt <egon@debian-devbox>2011-08-05 10:48:18 +0200
commitc5f661b715fbd86fcbca694c44bb8422f01db267 (patch)
tree064181b494c129c394314f7c337e143a04d2101f
parent8efc4d7b07ea389aa26eb017b66080eee2940653 (diff)
* apt-pkg/acquire-item.{cc,h}:
- do not check for a "Package" tag in optional index targets like the translations index
-rw-r--r--apt-pkg/acquire-item.cc4
-rw-r--r--apt-pkg/acquire-item.h10
-rw-r--r--configure.in2
-rw-r--r--debian/changelog7
4 files changed, 20 insertions, 3 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index df83d1481..d0fbf948f 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -808,6 +808,9 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, IndexTarget const *Target,
if (CompressionExtension.empty() == false)
CompressionExtension.erase(CompressionExtension.end()-1);
+ if (Target->IsOptional())
+ Verify = false;
+
Init(Target->URI, Target->Description, Target->ShortDesc);
}
/*}}}*/
@@ -905,6 +908,7 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,string Hash,
/* Verify the index file for correctness (all indexes must
* have a Package field) (LP: #346386) (Closes: #627642) */
+ if (Verify == true)
{
FileFd fd(DestFile, FileFd::ReadOnly);
pkgTagSection sec;
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index f39a90c0b..13be17a01 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -559,6 +559,16 @@ class pkgAcqIndex : public pkgAcquire::Item
*/
bool Erase;
+ /** \brief Verify for correctness by checking if a "Package"
+ * tag is found in the index. This can be set to
+ * false for optional index targets
+ *
+ */
+ // FIXME: instead of a bool it should use a verify string that will
+ // then be used in the pkgAcqIndex::Done method to ensure that
+ // the downloaded file contains the expected tag
+ bool Verify;
+
/** \brief The download request that is currently being
* processed.
*/
diff --git a/configure.in b/configure.in
index 3dde2fe47..89c4b240c 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.8.15")
+AC_DEFINE_UNQUOTED(VERSION,"0.8.16~exp5")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index 2d3f1a9c9..f0c0790fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.8.16~exp5) UNRELEASED; urgency=low
+apt (0.8.16~exp5) UNRELEASEDexperimental; urgency=low
* apt-pkg/makefile:
- install sha256.h compat header
@@ -7,8 +7,11 @@ apt (0.8.16~exp5) UNRELEASED; urgency=low
libapt does not segfault if the cache is remapped in between
(LP: #812862)
- fix crash when P.Arch() was used but the cache got remapped
+ * apt-pkg/acquire-item.{cc,h}:
+ - do not check for a "Package" tag in optional index targets
+ like the translations index
- -- Michael Vogt <mvo@debian.org> Mon, 01 Aug 2011 15:31:55 +0200
+ -- Michael Vogt <mvo@debian.org> Fri, 05 Aug 2011 09:11:42 +0200
apt (0.8.16~exp4) experimental; urgency=low