* 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

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 982a35d741809eaf589affffe1cc4f6182cee810..f3a1c736d6672945034d7eab8b60256cc5186026 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -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 +56,8 @@ check_size_constraints()
        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 +80,6 @@ check_size_constraints()
     fi
 }
 
-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 @@ fi
 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