From: Michael Vogt Date: Mon, 5 May 2008 16:18:58 +0000 (+0200) Subject: * Updated cron script to support backups by hardlinks and X-Git-Tag: 0.7.24ubuntu1~66^2~5 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/c7560b77de12a7d4ee8ea0e7c93fe7bb65e853f1?hp=--cc * Updated cron script to support backups by hardlinks and verbose levels. All features turned off by default. * Added more error handlings. Closes: #438803, #462734, #454989, * Refactored condition structure to make download and upgrade performed if only previous steps succeeded. Closes: #341970 * Documented all cron script related configuration items in configure-index. --- c7560b77de12a7d4ee8ea0e7c93fe7bb65e853f1 diff --cc debian/apt.cron.daily index 1ca830c93,d89d9b2c0..acecd29ac --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@@ -72,109 -102,123 +102,123 @@@ update_stamp( touch $stamp } - - - # we check here if autoclean was enough sizewise - check_size_constraints() + debug_echo() { - # min-age in days - MaxAge=0 - MinAge=2 - MaxSize=0 - CacheDir="var/cache/apt" - CacheArchive="archives/" - eval $(apt-config shell MaxAge APT::Archives::MaxAge) - eval $(apt-config shell MinAge APT::Archives::MinAge) - eval $(apt-config shell MaxSize APT::Archives::MaxSize) - eval $(apt-config shell Dir Dir) - eval $(apt-config shell CacheDir Dir::Cache) - eval $(apt-config shell CacheArchive Dir::Cache::archives) - - # sanity check - if [ -z "$CacheDir" -o -z "$CacheArchive" ]; then - echo "empty Dir::Cache or Dir::Cache::archives, exiting" - exit + # Display message if $VERBOSE >= 1 + if [ "$VERBOSE" -ge 1 ]; then + echo $1 1>&2 fi - - Cache="${Dir%/}/${CacheDir%/}/${CacheArchive%/}/" + } + + # check apt-config exstance + if ! which apt-config >/dev/null ; then + exit 0 + fi - # check age - if [ ! $MaxAge -eq 0 ] && [ ! $MinAge -eq 0 ]; then - find $Cache -name "*.deb" \( -mtime +$MaxAge -and -ctime +$MaxAge \) -and -not \( -mtime -$MinAge -or -ctime -$MinAge \) -print0 | xargs -r -0 rm -f - elif [ ! $MaxAge -eq 0 ]; then - find $Cache -name "*.deb" -ctime +$MaxAge -and -mtime +$MaxAge -print0 | xargs -r -0 rm -f + # Set VERBOSE mode from apt-config (or inherit from environment) + eval $(apt-config shell VERBOSE APT::Periodic::Verbose) + if [ -z "$VERBOSE" ]; then + VERBOSE="0" + fi + if [ "$VERBOSE" -le 2 ]; then + # quiet for 0,1,2 + XSTDOUT=">/dev/null" + XSTDERR="2>/dev/null" + XAPTOPT="-qq" + XUUPOPT="" + else + XSTDOUT="" + XSTDERR="" + XAPTOPT="" + XUUPOPT="-d" + fi + if [ "$VERBOSE" -ge 3 ]; then + # trace output + 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 on main power." + exit 0 + elif [ $POWER -ne 0 ]; then + debug_echo "exit: power status ($POWER) undetermined." + exit 0 fi - - # check size - if [ ! $MaxSize -eq 0 ]; then - # maxSize is in MB - MaxSize=$(($MaxSize*1024)) - - #get current time - now=$(date --date=$(date --iso-8601) +%s) - MinAge=$(($MinAge*24*60*60)) - - # reverse-sort by mtime - for file in $(ls -rt $Cache/*.deb 2>/dev/null); do - du=$(du -s $Cache) - size=${du%%/*} - # check if the cache is small enough - if [ $size -lt $MaxSize ]; then - break - fi + debug_echo "system is on main power." + fi - # check for MinAge of the file - if [ ! $MinAge -eq 0 ]; then - # check both ctime and mtime - mtime=$(stat -c %Y $file) - ctime=$(stat -c %Z $file) - if [ $mtime -gt $ctime ]; then - delta=$(($now-$mtime)) - else - delta=$(($now-$ctime)) - fi - #echo "$file ($delta), $MinAge" - if [ $delta -le $MinAge ]; then - #echo "Skiping $file (delta=$delta)" - break - fi - fi + # check if we can lock the cache and if the cache is clean + 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 + # No need to check for apt-get below - # delete oldest file - rm -f $file - done - fi - } + # Global current time in seconds since 1970-01-01 00:00:00 UTC + now=$(date +%s) - # sleep for a random intervall of time (default 30min) - # (some code taken from cron-apt, thanks) - random_sleep() - { - RandomSleep=1800 - eval $(apt-config shell RandomSleep APT::Periodic::RandomSleep) - if [ $RandomSleep -eq 0 ]; then - return - 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") - fi - TIME=$(($RANDOM % $RandomSleep)) - sleep $TIME - } + # 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=${CacheDir%/} + if [ -z "$CacheDir" ]; then + debug_echo "practically empty Dir::Cache, exiting" + exit 0 + fi - # main + CacheArchive="archives/" + eval $(apt-config shell CacheArchive Dir::Cache::Archives) + CacheArchive=${CacheArchive%/} + if [ -z "$CacheArchive" ]; then + debug_echo "practically empty Dir::Cache::archives, exiting" + exit 0 + fi - if ! which apt-config >/dev/null; then - exit 0 + BackupArchiveInterval=0 + eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterval) + -BackupArchiveLevel=3 -eval $(apt-config shell BackupArchiveLevel APT::Periodic::BackupArchiveLevel) -if [ $BackupArchiveLevel -le 1 ]; then BackupArchiveLevel=2 ; fi ++BackupLevel=3 ++eval $(apt-config shell BackupLevel APT::Periodic::BackupLevel) ++if [ $BackupLevel -le 1 ]; then BackupLevel=2 ; fi + + CacheBackup="backup/" + eval $(apt-config shell CacheBackup Dir::Cache::Backup) + CacheBackup=${CacheBackup%/} + if [ -z "$CacheBackup" ]; then + echo "practically empty Dir::Cache::Backup, exiting" 1>&2 + exit 0 fi + # Support old Archive for compatibility. + # Document only Periodic for all controling parameters of this script. + MaxAge=0 + eval $(apt-config shell MaxAge APT::Archives::MaxAge) + eval $(apt-config shell MaxAge APT::Periodic::MaxAge) + + MinAge=2 + eval $(apt-config shell MinAge APT::Archives::MinAge) + eval $(apt-config shell MinAge APT::Periodic::MinAge) + + MaxSize=0 + eval $(apt-config shell MaxSize APT::Archives::MaxSize) + eval $(apt-config shell MaxSize APT::Periodic::MaxSize) + UpdateInterval=0 + eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists) + DownloadUpgradeableInterval=0 - eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages) - AutocleanInterval=$DownloadUpgradeableInterval - eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval) + eval $(apt-config shell DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages) UnattendedUpgradeInterval=0 eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade) diff --cc debian/changelog index 0a42c92ae,1fe58b3b9..96c8ef86d --- a/debian/changelog +++ b/debian/changelog @@@ -5,18 -5,20 +5,27 @@@ apt (0.7.14) UNRELEASED; urgency=lo Thanks to Frédéric Bothamy for the patch Closes: #322470 + [ Osamu Aoki ] + * Updated cron script to support backups by hardlinks and + verbose levels. All features turned off by default. + * Added more error handlings. Closes: #438803, #462734, #454989, + * Refactored condition structure to make download and upgrade performed + if only previous steps succeeded. Closes: #341970 + * Documented all cron script related configuration items in + configure-index. + [ Program translations ] - - Simplified Chinese updated. Closes: #473360 - - Catalan fixes. Closes: #387141 - - Typo fix in Greek translation. Closes: #479122 - - French updated. + * Simplified Chinese updated. Closes: #473360 + * Catalan fixes. Closes: #387141 + * Typo fix in Greek translation. Closes: #479122 + * French updated. + * Thai updated. Closes: #479313 + * Italian updated. Closes: #479326 + * Polish updated. Closes: #479342 + * Bulgarian updated. Closes: #479379 + * Finnish updated. Closes: #479403 + * Korean updated. Closes: #479426 + * Basque updated. Closes: #479452 -- Christian Perrier Sun, 04 May 2008 08:31:06 +0200