summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2010-05-07 09:20:34 +0200
committerJulian Andres Klode <jak@debian.org>2010-05-07 09:20:34 +0200
commit921a3ce01c2595e9df9ff20bdd259e14733dcb16 (patch)
tree300ddfdc0cd69806001a029a0828a9e32c6bfaeb
parentd7087c493bf2fc7a0eaf6fa308c496c81e6dc98f (diff)
apt-pkg/acquire-item.cc: Fix pkgAcqFile::Custom600Headers() to always return something.
-rw-r--r--apt-pkg/acquire-item.cc2
-rw-r--r--debian/changelog7
2 files changed, 9 insertions, 0 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 1f253bb81..88cac7f7f 100644
--- 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";
+ else
+ return string();
}
/*}}}*/
diff --git a/debian/changelog b/debian/changelog
index 004a890e1..265f5b568 100644
--- 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 ]