diff options
| author | Christian Perrier <bubulle@debian.org> | 2005-05-07 12:10:48 +0000 |
|---|---|---|
| committer | Christian Perrier <bubulle@debian.org> | 2005-05-07 12:10:48 +0000 |
| commit | fb7bd000b3cf84807b6a9ec66609e7938c3a343f (patch) | |
| tree | 66b150f3c4c9dc4970f5fcafa26157ddb2c939d7 | |
| parent | 080bf1be2e89f533cdf2b0192837fc8542e02602 (diff) | |
| parent | 61abe43c0b6c74ef561c093bbd0c0d4626558655 (diff) | |
Merge with Matt
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
| -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 1d830260b..24ad6855a 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -155,7 +155,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 @@ -170,7 +170,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 1071d0b24..8df894e16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.6.36) unstable; urgency=low +apt (0.6.36) experimental; urgency=low * Merge apt--mvo--0: - apt-pkg/acquire-item.cc: |