diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-09-06 16:35:10 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-09-06 16:35:10 +0000 |
| commit | d713e67d4bf668df8024aa9e3fa5875b6f056801 (patch) | |
| tree | afc5f703d58adb59424d4f9ae730e3bbd0c200c1 | |
| parent | 5d4aff08accfd096d50d99a24df1437a2fa41c8d (diff) | |
| parent | 8e29e348071f5d043e72c86a7c6d38e76a70c5ba (diff) | |
* cherry-pick a fix from apt--mvo--0 to check the ctime as well when packages are removed (because they are too old)
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-53
* check ctime as well in cron.daily when cleaning up packages in apt.cron.daily
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/apt.cron.daily | 14 | ||||
| -rw-r--r-- | debian/changelog | 13 |
3 files changed, 22 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 6158933ee..494c68033 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.40.1ubuntu2") +AC_DEFINE_UNQUOTED(VERSION,"0.6.40.1ubuntu3") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 2d93a5ba4..e3aaccfb0 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -95,9 +95,9 @@ check_size_constraints() # check age if [ ! $MaxAge -eq 0 ] && [ ! $MinAge -eq 0 ]; then - find $Cache -name "*.deb" -mtime +$MaxAge -and -not -mtime -$MinAge -print0 | xargs -r -0 rm -f + 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" -mtime +$MaxAge -print0 | xargs -r -0 rm -f + find $Cache -name "*.deb" -ctime +$MaxAge -and -mtime +$MaxAge -print0 | xargs -r -0 rm -f fi # check size @@ -120,8 +120,14 @@ check_size_constraints() # check for MinAge of the file if [ ! $MinAge -eq 0 ]; then - mtime=$(date --date=$(date -r $file --iso-8601) +%s) - delta=$(($now-$mtime)) + # check both ctime and mtime + mtime=$(date -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)" diff --git a/debian/changelog b/debian/changelog index a5f4f11ec..a270e3b25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.6.40.1ubuntu3) breezy; urgency=low + + * debian/apt.cron.daily: + - use the ctime as well when figuring what packages need to + be removed. This fixes the problem that packages copied with + "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Sep 2005 18:30:46 +0200 + apt (0.6.40.1ubuntu2) breezy; urgency=low * improved the support for "error" and "conffile" reporting from @@ -32,7 +41,7 @@ apt (0.6.40.1) unstable; urgency=low apt (0.6.40ubuntu1) breezy; urgency=low - * Synchronize with Debian + * Synchronize with Debian -- Matt Zimmerman <mdz@ubuntu.com> Thu, 4 Aug 2005 15:53:22 -0700 @@ -94,7 +103,7 @@ apt (0.6.39) unstable; urgency=low * Update priority of apt-utils to important, to match the override file * Install only one keyring on each branch (Closes: #316119) - -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:35:21 -0700 + -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:35:21 -0700 apt (0.6.38ubuntu1) breezy; urgency=low |