diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-05-07 17:45:10 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-05-07 17:45:10 +0000 |
| commit | 94dc9d7d8bbf2f1351db26e4532327c6784ead96 (patch) | |
| tree | de7a2193f47268c7974812604fb44b211b31040e /debian | |
| parent | 6cb30d01f8e247e85966ba8ad657453d73598527 (diff) | |
| parent | 61abe43c0b6c74ef561c093bbd0c0d4626558655 (diff) | |
* merge with matt, search for the right patch next instead of applying them in order
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-77
Merge apt--mvo--0
* apt@packages.debian.org/apt--main--0--patch-78
Update changelog
* 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-14
* changelog entry for 0.6.34ubuntu1 added, MinAge default is 2 days now
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-15
* merged with matts tree
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-16
* changelog updated
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-17
* whitespace change to add incomplete log for last patch
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-18
* honor "Acquire::gpgv::Options" in apt-cdrom too
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-19
* corrected a incorrect use of string().c_str() (thanks to mdz!)
* 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 | 6 | ||||
| -rw-r--r-- | debian/changelog | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 7ee7e46db..2d93a5ba4 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -74,7 +74,7 @@ check_size_constraints() { # min-age in days MaxAge=0 - MinAge=1 + MinAge=2 MaxSize=0 CacheDir="var/cache/apt" CacheArchive="archives/" @@ -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 1820b2cbf..87e713d3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +apt (0.6.36) experimental; urgency=low + + * Merge apt--mvo--0: + - apt-pkg/acquire-item.cc: + added "Acquire::BrokenProxy" that will force apt to always + re-get the Release.gpg file (for broken proxies) + - debian/apt.cron.daily: + MinAge is defaulting to 2 days now to prevent over-aggresive removal + - apt-pkg/cdrom.cc: + honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496) + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 31 Mar 2005 20:37:11 +0200 + apt (0.6.35) hoary; urgency=low * Merge apt--mvo--0 (incorporates 0.6.34ubuntu1): |