prepare new upload

[apt.git] / debian / apt.cron.daily

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index b6099ee75aa30cd22b8e2c8dcf56a17aff7238ad..3f9df9d7e4b3056f57c1d82ee6417023d75606e6 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -8,10 +8,10 @@
 #  Dir "/";
 #  - RootDir for all configuration files
 #
 #  Dir "/";
 #  - RootDir for all configuration files
 #

-#  Dir::Cache "var/apt/cache/";
+#  Dir::Cache "var/cache/apt/";

 #  - Set apt package cache directory
 #
 #  - Set apt package cache directory
 #

-#  Dir::Cache::Archive "archives/";
+#  Dir::Cache::Archives "archives/";

 #  - Set package archive directory
 #
 #  APT::Periodic::Enable "1";
 #  - Set package archive directory
 #
 #  APT::Periodic::Enable "1";


@@ -147,21 +147,14 @@ check_size_constraints()
     eval $(apt-config shell MaxSize APT::Archives::MaxSize)
     eval $(apt-config shell MaxSize APT::Periodic::MaxSize)
 
     eval $(apt-config shell MaxSize APT::Archives::MaxSize)
     eval $(apt-config shell MaxSize APT::Periodic::MaxSize)
 

-    CacheDir="var/cache/apt/"
-    eval $(apt-config shell CacheDir Dir::Cache)
-    CacheDir=${CacheDir%/}
-
-    CacheArchive="archives/"
-    eval $(apt-config shell CacheArchive Dir::Cache::archives)
-    CacheArchive=${CacheArchive%/}
+    Cache="/var/cache/apt/archives/"
+    eval $(apt-config shell Cache Dir::Cache::archives/d)

 
     # sanity check
 
     # sanity check

-    if [ -z "$CacheDir" -o -z "$CacheArchive" ]; then
-       echo "empty Dir::Cache or Dir::Cache::archives, exiting"
+    if [ -z "$Cache" ]; then
+       echo "empty Dir::Cache::archives, exiting"

        exit
     fi
        exit
     fi

-    
-    Cache="${Dir%/}/${CacheDir%/}/${CacheArchive%/}/"

 
     # check age
     if [ ! $MaxAge -eq 0 ] && [ ! $MinAge -eq 0 ]; then
 
     # check age
     if [ ! $MaxAge -eq 0 ] && [ ! $MinAge -eq 0 ]; then


@@ -225,22 +218,17 @@ do_cache_backup()
     fi
 
     # Set default values and normalize
     fi
 
     # Set default values and normalize

-    Dir="/"
-    eval $(apt-config shell Dir Dir)
-    Dir=${Dir%/}
-
-    CacheDir="var/cache/apt/"
-    eval $(apt-config shell CacheDir Dir::Cache)
+    CacheDir="/var/cache/apt"
+    eval $(apt-config shell CacheDir Dir::Cache/d)

     CacheDir=${CacheDir%/}
     if [ -z "$CacheDir" ]; then
        debug_echo "practically empty Dir::Cache, exiting"
        return 0
     fi
 
     CacheDir=${CacheDir%/}
     if [ -z "$CacheDir" ]; then
        debug_echo "practically empty Dir::Cache, exiting"
        return 0
     fi
 

-    CacheArchive="archives/"
-    eval $(apt-config shell CacheArchive Dir::Cache::Archives)
-    CacheArchive=${CacheArchive%/}
-    if [ -z "$CacheArchive" ]; then
+    Cache="${CacheDir}/archives/"
+    eval $(apt-config shell Cache Dir::Cache::Archives/d)
+    if [ -z "$Cache" ]; then

        debug_echo "practically empty Dir::Cache::archives, exiting"
        return 0
     fi
        debug_echo "practically empty Dir::Cache::archives, exiting"
        return 0
     fi


@@ -251,16 +239,15 @@ do_cache_backup()
        BackupLevel=2 ; 
     fi
     
        BackupLevel=2 ; 
     fi
     

-    CacheBackup="backup/"
-    eval $(apt-config shell CacheBackup Dir::Cache::Backup)
-    CacheBackup=${CacheBackup%/}
-    if [ -z "$CacheBackup" ]; then
+    Back="${CacheDir}/backup/"
+    eval $(apt-config shell Back Dir::Cache::Backup/d)
+    if [ -z "$Back" ]; then

        echo "practically empty Dir::Cache::Backup, exiting" 1>&2
        return
     fi
 
        echo "practically empty Dir::Cache::Backup, exiting" 1>&2
        return
     fi
 

-    Cache="${Dir}/${CacheDir}/${CacheArchive}/"
-    Back="${Dir}/${CacheDir}/${CacheBackup}/"
+    CacheArchive="$(basename "${Cache}")"
+    test -n "${CacheArchive}" || CacheArchive="archives"

     BackX="${Back}${CacheArchive}/"
     for x in $(seq 0 1 $((${BackupLevel}-1))); do 
        eval "Back${x}=${Back}${x}/"
     BackX="${Back}${CacheArchive}/"
     for x in $(seq 0 1 $((${BackupLevel}-1))); do 
        eval "Back${x}=${Back}${x}/"


@@ -302,7 +289,7 @@ random_sleep()
     fi
     if [ -z "$RANDOM" ] ; then
         # A fix for shells that do not have this bash feature.
     fi
     if [ -z "$RANDOM" ] ; then
         # A fix for shells that do not have this bash feature.

-       RANDOM=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c"1-5")
+       RANDOM=$(( $(dd if=/dev/urandom bs=2 count=1 2> /dev/null | cksum | cut -d' ' -f1) % 32767 ))

     fi
     TIME=$(($RANDOM % $RandomSleep))
     debug_echo "sleeping for $TIME seconds"
     fi
     TIME=$(($RANDOM % $RandomSleep))
     debug_echo "sleeping for $TIME seconds"


@@ -318,8 +305,39 @@ debug_echo()
     fi
 }
 
     fi
 }
 

+check_power(){
+    # laptop check, on_ac_power returns:
+    #       0 (true)    System is on main power
+    #       1 (false)   System is not on main power
+    #       255 (false) Power status could not be determined
+    # Desktop systems always return 255 it seems
+    if which on_ac_power >/dev/null; then
+        on_ac_power
+        POWER=$?
+        if [ $POWER -eq 1 ]; then
+           debug_echo "exit: system NOT on main power"
+           return 1
+        elif [ $POWER -ne 0 ]; then
+           debug_echo "power status ($POWER) undetermined, continuing"
+        fi
+        debug_echo "system is on main power."
+    fi
+    return 0
+}
+

 # ------------------------ main ----------------------------
 
 # ------------------------ main ----------------------------
 

+if test -r /var/lib/apt/extended_states; then
+    # Backup the 7 last versions of APT's extended_states file
+    # shameless copy from dpkg cron
+    if cd /var/backups ; then
+       if ! cmp -s apt.extended_states.0 /var/lib/apt/extended_states; then
+           cp -p /var/lib/apt/extended_states apt.extended_states
+           savelog -c 7 apt.extended_states >/dev/null
+       fi
+    fi
+fi
+

 # check apt-config exstance
 if ! which apt-config >/dev/null ; then
        exit 0
 # check apt-config exstance
 if ! which apt-config >/dev/null ; then
        exit 0


@@ -354,25 +372,10 @@ if [ "$VERBOSE" -ge 3 ]; then
     set -x
 fi
 
     set -x
 fi
 

-# laptop check, on_ac_power returns:
-#       0 (true)    System is on main power
-#       1 (false)   System is not on main power
-#       255 (false) Power status could not be determined
-# Desktop systems always return 255 it seems
-if which on_ac_power >/dev/null; then
-    on_ac_power
-    POWER=$?
-    if [ $POWER -eq 1 ]; then
-       debug_echo "exit: system NOT on main power"
-       exit 0
-    elif [ $POWER -ne 0 ]; then
-       debug_echo "power status ($POWER) undetermined, continuing"
-    fi
-    debug_echo "system is on main power."
-fi
+check_power || exit 0

 
 # check if we can lock the cache and if the cache is clean
 
 # check if we can lock the cache and if the cache is clean

-if which apt-get >/dev/null && ! eval apt-get check -f $XAPTOPT $XSTDERR ; then
+if which apt-get >/dev/null && ! eval apt-get check $XAPTOPT $XSTDERR ; then

     debug_echo "error encountered in cron job with \"apt-get check\"."
     exit 0
 fi
     debug_echo "error encountered in cron job with \"apt-get check\"."
     exit 0
 fi


@@ -401,12 +404,16 @@ eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterv
 Debdelta=1
 eval $(apt-config shell Debdelta APT::Periodic::Download-Upgradeable-Packages-Debdelta)
 
 Debdelta=1
 eval $(apt-config shell Debdelta APT::Periodic::Download-Upgradeable-Packages-Debdelta)
 

-# check if we actually have to do anything
+# check if we actually have to do anything that requires locking the cache

 if [ $UpdateInterval -eq 0 ] &&
    [ $DownloadUpgradeableInterval -eq 0 ] &&
    [ $UnattendedUpgradeInterval -eq 0 ] &&
    [ $BackupArchiveInterval -eq 0 ] &&
    [ $AutocleanInterval -eq 0 ]; then
 if [ $UpdateInterval -eq 0 ] &&
    [ $DownloadUpgradeableInterval -eq 0 ] &&
    [ $UnattendedUpgradeInterval -eq 0 ] &&
    [ $BackupArchiveInterval -eq 0 ] &&
    [ $AutocleanInterval -eq 0 ]; then

+
+    # check cache size
+    check_size_constraints
+

     exit 0
 fi
 
     exit 0
 fi
 


@@ -416,6 +423,14 @@ do_cache_backup $BackupArchiveInterval
 # sleep random amount of time to avoid hitting the 
 # mirrors at the same time
 random_sleep
 # sleep random amount of time to avoid hitting the 
 # mirrors at the same time
 random_sleep

+check_power || exit 0
+
+# include default system language so that "apt-get update" will
+# fetch the right translated package descriptions
+if [ -r /etc/default/locale ]; then
+    . /etc/default/locale
+    export LANG LANGUAGE LC_MESSAGES LC_ALL
+fi

 
 # update package lists
 UPDATED=0
 
 # update package lists
 UPDATED=0


@@ -459,7 +474,7 @@ fi
 
 # auto upgrade all upgradeable packages
 UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp
 
 # auto upgrade all upgradeable packages
 UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp

-if [ $UPDATED -eq 1 ] && which unattended-upgrade >/dev/null && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then
+if which unattended-upgrade >/dev/null && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then

     if unattended-upgrade $XUUPOPT; then
        update_stamp $UPGRADE_STAMP
        debug_echo "unattended-upgrade (success)"
     if unattended-upgrade $XUUPOPT; then
        update_stamp $UPGRADE_STAMP
        debug_echo "unattended-upgrade (success)"