diff options
| author | Otavio Salvador <otavio@debian.org> | 2005-05-12 23:19:27 +0000 |
|---|---|---|
| committer | Otavio Salvador <otavio@debian.org> | 2005-05-12 23:19:27 +0000 |
| commit | 8bd0670fc9f71add3441befc1894879cbbdeee1d (patch) | |
| tree | 16cc40463a0f75f071dfd7b7f4353c30a5902a0a /debian | |
| parent | 9d06ea8bcdc7ce7b8f3bf9f25398350cf55423c3 (diff) | |
| parent | 61abe43c0b6c74ef561c093bbd0c0d4626558655 (diff) | |
Merge last changes from apt--main--0.
Merge last changes from apt--main--0.
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-79
Merge michael.vogt@ubuntu.com--2005/apt--mvo--0
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-20
* supress output when /var/cache/apt/archives is empty; break when min-age is reached
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-21
* changed distro to "experimental", changed version number to 0.6.36
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt.cron.daily | 4 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 5145a5d2f..2d93a5ba4 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -110,7 +110,7 @@ check_size_constraints() MinAge=$(($MinAge*24*60*60)) # reverse-sort by mtime - for file in $(ls -rt $Cache/*.deb); do + for file in $(ls -rt $Cache/*.deb 2>/dev/null); do du=$(du -s $Cache) size=${du%%/*} # check if the cache is small enough @@ -125,7 +125,7 @@ check_size_constraints() #echo "$file ($delta), $MinAge" if [ $delta -le $MinAge ]; then #echo "Skiping $file (delta=$delta)" - continue + break fi fi diff --git a/debian/changelog b/debian/changelog index 4cdeee956..4cf7ea40a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ apt (0.6.36os1) unstable; urgency=low -- Otavio Salvador <otavio@debian.org> Thu, 7 Apr 2005 21:16:46 -0300 -apt (0.6.36) unstable; urgency=low +apt (0.6.36) experimental; urgency=low * Merge apt--mvo--0: - apt-pkg/acquire-item.cc: |