diff options
| author | Otavio Salvador <otavio@debian.org> | 2005-04-08 00:21:06 +0000 |
|---|---|---|
| committer | Otavio Salvador <otavio@debian.org> | 2005-04-08 00:21:06 +0000 |
| commit | b2869b22be57f9243eec6ef1abe118a0252b7172 (patch) | |
| tree | 374ddbd4acf6d28ed6c9cce9d8130fcf067ef1db /apt-pkg/acquire-item.cc | |
| parent | 035df853656f57238ccb59a42e4602c39661df25 (diff) | |
| parent | ea8704883049f180ca1c5607f1de0118b7d86c60 (diff) | |
Sync with apt--main--0--patch-78
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
* 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!)
Diffstat (limited to 'apt-pkg/acquire-item.cc')
| -rw-r--r-- | apt-pkg/acquire-item.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 3df9f2407..12dc811a6 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -369,6 +369,12 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, // File was already in place. It needs to be re-verified // because Release might have changed, so Move it into partial Rename(Final,DestFile); + // unlink the file and do not try to use I-M-S and Last-Modified + // if the users proxy is broken + if(_config->FindB("Acquire::BrokenProxy", false) == true) { + std::cerr << "forcing re-get of the signature file as requested" << std::endl; + unlink(DestFile.c_str()); + } } QueueURI(Desc); |