merged from lp:~donkult/apt/sid

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index cf88ded7b243da48ac69de813331172712a8908b..39b9feff24f6c8670c2dab5ee74d5061b53cef0c 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -840,7 +840,7 @@ string pkgAcqIndex::Custom600Headers()
    if (ShortDesc().find("Translation") != 0)
       msg += "\nFail-Ignore: true";
    struct stat Buf;
-   if (stat(Final.c_str(),&Buf) != 0)
+   if (stat(Final.c_str(),&Buf) == 0)
       msg += "\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
 
    return msg;

diff --git a/debian/changelog b/debian/changelog
index e669077fed84726e8603ba63eacd450df3f4fd37..ba4455a60ddd7cb4d3634ae153744a1a7857cd0b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,13 @@ apt (0.8.13.1) UNRELEASED; urgency=low
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 29 Mar 2011 13:12:45 +0200
 
+apt (0.8.13.1) unstable; urgency=low
+
+  * apt-pkg/acquire-item.cc: Use stat buffer if stat was
+    successful, not if it failed (Closes: #620546)
+
+ -- Julian Andres Klode <jak@debian.org>  Sat, 02 Apr 2011 20:55:35 +0200
+
 apt (0.8.13) unstable; urgency=low
 
   [ Thorsten Spindler ]