From: Michael Vogt Date: Tue, 15 Mar 2005 09:58:48 +0000 (+0000) Subject: * be more carefull when building the archive path (thanks to matt!) X-Git-Tag: 0.7.24ubuntu1~341^2~4 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/01717245170c1fbb8080a9737f1da70877e302e8 * be more carefull when building the archive path (thanks to matt!) Patches applied: * apt@packages.debian.org/apt--main--0--patch-67 Open 0.6.35 * apt@packages.debian.org/apt--main--0--patch-68 Merge apt--mvo--0 * apt@packages.debian.org/apt--main--0--patch-69 Correct spelling in cron.daily * apt@packages.debian.org/apt--main--0--patch-70 Use find|xargs rather than find -exec in cron.daily * apt@packages.debian.org/apt--main--0--patch-71 Update changelog --- 01717245170c1fbb8080a9737f1da70877e302e8 diff --cc debian/apt.cron.daily index 76c90c8bb,982a35d74..f3a1c736d --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@@ -47,6 -47,6 +47,7 @@@ check_size_constraints( CacheArchive="archives/" eval $(apt-config shell MaxAge APT::Archives::MaxAge) 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) @@@ -55,7 -55,7 +56,8 @@@ echo "empty Dir::Cache or Dir::Cache::archives, exiting" exit fi -- Cache="/"$CacheDir$CacheArchive ++ ++ Cache="${Dir%/}/${CacheDir%/}/${CacheArchive%/}/" # check age if [ ! $MaxAge -eq 0 ]; then @@@ -78,8 -78,8 +80,6 @@@ fi } - check_size_constrains -check_size_constraints -- UpdateInterval=0 DownloadUpgradeableInterval=0 eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages) @@@ -117,6 -117,6 +117,6 @@@ f AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then apt-get -qq autoclean -- check_size_contrains ++ check_size_constraints update_stamp $AUTOCLEAN_STAMP fi