apt-pkg/acquire-item.cc: Fix pkgAcqFile::Custom600Headers() to always return something.

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 1f253bb81b96966d3ca9982aaaa713618eb9d086..88cac7f7ff2f6b340ebdb71d132d3fe3d76478ef 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1685,5 +1685,7 @@ string pkgAcqFile::Custom600Headers()
 {
    if (IsIndexFile)
       return "\nIndex-File: true";
 {
    if (IsIndexFile)
       return "\nIndex-File: true";

+   else
+      return string();

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

diff --git a/debian/changelog b/debian/changelog
index 004a890e1a5552627925abf08880e0226d186ab9..265f5b56884a8c380fbcc00b4160bdf6a9a8354e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.7.26~exp5) UNRELEASED; urgency=low
+
+  * apt-pkg/acquire-item.cc:
+    - Fix pkgAcqFile::Custom600Headers() to always return something.
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 07 May 2010 09:18:45 +0200
+

 apt (0.7.26~exp4) experimental; urgency=low
 
   [ David Kalnischkies ]
 apt (0.7.26~exp4) experimental; urgency=low
 
   [ David Kalnischkies ]