From 13e8426f800dd5e21e78fa6488b860e3f0467984 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 23 Aug 2005 08:03:51 +0000 Subject: * merged with apt--fixes--0 Patches applied: * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-7 * fixed incorrect man-page example * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-8 * changelog udpate * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-9 * we only need to check once for xmlto * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-10 * fix a bug in a man-page, fix a problem with overly long lines in apt-cdrom * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-11 * merged with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-12 * fix a incorrect error message (it always added .gz regardless what was downloaded) * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-13 * merged with main * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-14 * added Hashsum support for file and cdrom * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-15 * added README.arch * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-16 * merged with main * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-17 * move the changelog to the right place * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-18 * Change pkgPolicy::Pin from private to protected * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-19 * added a default constructor for PrvIterator * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-20 * applied otavios patch to reread the statusFile on debSystem::Initialize * otavio@debian.org--2005/apt--fixes--0--patch-28 Reread status configuration, needed for clients using independent apt ... --- debian/changelog | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 39ab07b32..059840378 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -apt (0.6.40.2) unstable; urgency=low +apt (0.6.41) unstable; urgency=low * improved the support for "error" and "conffile" reporting from dpkg, added the format to README.progress-reporting * added README.progress-reporting to the apt-doc package * improved the network timeout handling, if a index file from a - sources.list times out, don't try to get the other files from - that entry + sources.list times out or EAI_AGAIN is returned from getaddrinfo, + don't try to get the other files from that entry * Support architecture-specific extra overrides (closes: #225947). Thanks to Anthony Towns for idea and the patch, thanks to Colin Watson for testing it. @@ -17,11 +17,15 @@ apt (0.6.40.2) unstable; urgency=low * Andreas Pakulat: - added example apt-ftparchive.conf file to doc/examples (closes: #322483) - * methods/connect.cc: - - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item - * apt-pkg/acquire-item.cc: - - fail early if a FailReason is TmpResolveFailure (avoids hangs during - the install when no network is available) + * Fix a incorrect example in the man-page (closes: #282918) + * Fix a bug for very long lines in the apt-cdrom code (closes: #280356) + * Fix a manual page bug (closes: #316314) + * Do md5sum checking for file and cdrom method (closes: #319142) + * Change pkgPolicy::Pin from private to protected to let subclasses + access it too (closes: #321799) + * add default constructor for PrvIterator (closes: #322267) + * Reread status configuration on debSystem::Initialize() + (needed for apt-proxy, thanks to Otavio for this patch) -- Michael Vogt Tue, 23 Aug 2005 00:15:00 +0200 -- cgit v1.2.3 From b8b1131a7d349db52a34a8cd6dd1872aebd50885 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 5 Sep 2005 21:06:46 +0000 Subject: * finalizing changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 059840378..cc3da8f84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,7 +27,7 @@ apt (0.6.41) unstable; urgency=low * Reread status configuration on debSystem::Initialize() (needed for apt-proxy, thanks to Otavio for this patch) - -- Michael Vogt Tue, 23 Aug 2005 00:15:00 +0200 + -- Michael Vogt Mon, 5 Sep 2005 22:59:03 +0200 apt (0.6.40.1) unstable; urgency=low -- cgit v1.2.3 From 8e29e348071f5d043e72c86a7c6d38e76a70c5ba Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 6 Sep 2005 16:29:05 +0000 Subject: * check ctime as well in cron.daily when cleaning up packages in apt.cron.daily --- debian/apt.cron.daily | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'debian') 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)" -- cgit v1.2.3