diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-04-04 14:13:14 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-04-04 14:13:14 +0200 |
| commit | 1a345eb134eda158c28788229b8229f38b4442bd (patch) | |
| tree | 734d415417e6f3daf29a526bca8cff3ceb530100 | |
| parent | d7ff329cd5a0be3ca67d1472f1fa4e0672a4f379 (diff) | |
| parent | 8d39b60d85b8123758f310e4a279c71879e13a06 (diff) | |
merged mvo branch
| -rw-r--r-- | apt-pkg/acquire-item.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 2ecb8ed6e..184802ca3 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -841,7 +841,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 b785b91d7..20a37dcc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +apt (0.8.13.1ubuntu1) natty; urgency=low + + * merged fixes from the debian-sid + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Mar 2011 15:56:54 +0100 + +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.13ubuntu2) natty; urgency=low * po/makefile: |