* apt-pkg/acquire-item.{cc,h}:

  - do not check for a "Package" tag in optional index targets
    like the translations index

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index df83d1481524b4e308ea7a488c86a8a571d57617..d0fbf948faeef519bf77bcf6f8b43a748bfe24d8 100644 (file)
--- 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 f39a90c0bfd7857d5ca0657b613d40441ec70740..13be17a017096ac4fc8c4b42a70a143fd6bbef9c 100644 (file)
--- 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 3dde2fe474bd89087deb694b32a05504a46dcebe..89c4b240cca055a7f054b095bd6c43436765f172 100644 (file)
--- 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 2d3f1a9c923e3dc264743adb13bbcf269f9e3a9f..f0c0790fb10049c2167585b3502d3ef321241005 100644 (file)
--- 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