From: Michael Vogt <mvo@debian.org>
Date: Thu, 27 Mar 2014 14:19:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
X-Git-Tag: 1.0~11^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/62f1ee1cc7a5e16ca0cbfbee3c00cefab1892f87?hp=-c

Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
---

62f1ee1cc7a5e16ca0cbfbee3c00cefab1892f87
diff --combined debian/apt.cron.daily
index d949e303a,aafd9e0ad..ee0761bfb
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@@ -41,7 -41,7 +41,7 @@@
  #  APT::Periodic::MaxSize "0"; (new)
  #  - Set maximum size of the cache in MB (0=disable). If the cache
  #    is bigger, cached package files are deleted until the size
 -#    requirement is met (the biggest packages will be deleted 
 +#    requirement is met (the oldest packages will be deleted 
  #    first).
  #
  #  APT::Periodic::Update-Package-Lists "0";
@@@ -91,7 -91,7 +91,7 @@@ check_stamp(
      stamp=$(date --date=$(date -r $stamp_file --iso-8601) +%s 2>/dev/null)
      if [ "$?" != "0" ]; then
          # Due to some timezones returning 'invalid date' for midnight on
-         # certain dates (eg America/Sao_Paulo), if date returns with error
+         # certain dates (e.g. America/Sao_Paulo), if date returns with error
          # remove the stamp file and return 0. See coreutils bug:
          # http://lists.gnu.org/archive/html/bug-coreutils/2007-09/msg00176.html
          rm -f "$stamp_file"
@@@ -101,14 -101,14 +101,14 @@@
      now=$(date --date=$(date --iso-8601) +%s 2>/dev/null)
      if [ "$?" != "0" ]; then
          # As above, due to some timezones returning 'invalid date' for midnight
-         # on certain dates (eg America/Sao_Paulo), if date returns with error
+         # on certain dates (e.g. America/Sao_Paulo), if date returns with error
          # return 0.
          return 0
      fi
  
      delta=$(($now-$stamp))
  
-     # intervall is in days, convert to sec.
+     # interval is in days, convert to sec.
      interval=$(($interval*60*60*24))
      debug_echo "check_stamp: interval=$interval, now=$now, stamp=$stamp, delta=$delta (sec)"
  
@@@ -338,7 -338,7 +338,7 @@@ if test -r /var/lib/apt/extended_states
      fi
  fi
  
- # check apt-config exstance
+ # check apt-config existence
  if ! which apt-config >/dev/null ; then
  	exit 0
  fi