merged from debian-sid

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;

debian/changelog

@@ -1,8 +1,25 @@
-apt (0.8.13) unstable; urgency=low
+apt (0.8.13.2) unstable; urgency=low
 
   [ Thorsten Spindler ]
   * debian/zzapt.cron.daily:
     - move cron job to the end of execution (LP: #727685)
+  
+  [ Michael Vogt ]
+  * mirror method:
+    - do not crash if the mirror file fails to download
+
+ -- 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.13) unstable; urgency=low
+
+  [ Thorsten Spindler ]
   * methods/rsh.cc
     - fix rsh/ssh option parsing (LP: #678080), thanks to
       Ville Mattila 
@@ -11,13 +28,15 @@ apt (0.8.13) unstable; urgency=low
   * apt-pkg/acquire-item.cc:
     - mark pkgAcqIndexTrans as Index-File to avoid asking the
       user to insert the CD on each apt-get update
+  * po/sl.po:
+    - updated, thanks to Andrej Znidarsic
   * mirror method:
     - when downloading data, show the mirror being used
-    - randomize mirror list to ensure more even load
-    - merge fix from Matt Zimmerman, many thanks (LP: #741098)
-    - do not crash if the mirror file fails to download
+    - randomize mirror list after download in a host specific way
+      to ensure that the load is evenly spreaded accross the mirrors
+    - fix some missing "Fail-Ignore"
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 15:56:54 +0100
+ -- Michael Vogt <mvo@debian.org>  Wed, 16 Mar 2011 08:04:42 +0100
 
 apt (0.8.12) unstable; urgency=low