diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2008-02-25 18:10:54 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2008-02-25 18:10:54 +0000 |
| commit | 604c9ee885ba964a4057a6e9ba1f54103afee83d (patch) | |
| tree | 2b4d18e8d2210d4a30e8490bccadfa2aabca3299 /debian | |
| parent | f6c0d4ae82e5300cc39d4d95837ab939f15fec9b (diff) | |
* debian/apt.cron.daily:
- show update-notifier notification on authentication failure
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt.cron.daily | 27 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 29 insertions, 0 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 1b54cdf1c..b0164a576 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -147,6 +147,25 @@ check_size_constraints() fi } +# 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 +} + +# main + if ! which apt-config >/dev/null; then exit 0 fi @@ -190,6 +209,14 @@ if [ -n "$admin_user" ] && [ -x /usr/bin/sudo ] && [ -z "$http_proxy" ]; then fi fi +# sleep random amount of time +random_sleep + +# check again if we can access the cache +if ! apt-get check -q -q 2>/dev/null; then + exit 1 +fi + UPDATE_STAMP=/var/lib/apt/periodic/update-stamp if check_stamp $UPDATE_STAMP $UpdateInterval; then # check for a new archive signing key (against the master keyring) diff --git a/debian/changelog b/debian/changelog index dfde4686d..cb7755547 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ apt (0.7.9ubuntu12) hardy; urgency=low - use admin user proxy settings * cmdline/apt-get.cc: - fix task installation (thanks to Colin Watson) + * debian/apt.cron.daily: + - show update-notifier notification on authentication failure -- |