diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2013-07-02 16:53:45 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2013-07-02 16:53:45 +0200 |
| commit | 56363109dac51dffb6ec8491728e0bc934a15fa1 (patch) | |
| tree | 90db7c6af4ea25028df6c2731a57b0724fc3c626 /apt-pkg/acquire-item.cc | |
| parent | 3599bca5211077f5456a40adb5cec1bcbee8c3ae (diff) | |
| parent | 4b8528bd5749f759e924534709a620da67cd40f8 (diff) | |
merged debian/sid branch from git.debian.org
Diffstat (limited to 'apt-pkg/acquire-item.cc')
| -rw-r--r-- | apt-pkg/acquire-item.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index a79dfb727..46e4a7065 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1300,7 +1300,14 @@ void pkgAcqMetaIndex::RetrievalDone(string Message) /*{{{*/ string FinalFile = _config->FindDir("Dir::State::lists"); FinalFile += URItoFileName(RealURI); if (SigFile == DestFile) + { SigFile = FinalFile; + // constructor of pkgAcqMetaClearSig moved it out of the way, + // now move it back in on IMS hit for the 'old' file + string const OldClearSig = DestFile + ".reverify"; + if (RealFileExists(OldClearSig) == true) + Rename(OldClearSig, FinalFile); + } DestFile = FinalFile; } Complete = true; @@ -1606,7 +1613,11 @@ string pkgAcqMetaClearSig::Custom600Headers() struct stat Buf; if (stat(Final.c_str(),&Buf) != 0) - return "\nIndex-File: true\nFail-Ignore: true\n"; + { + Final = DestFile + ".reverify"; + if (stat(Final.c_str(),&Buf) != 0) + return "\nIndex-File: true\nFail-Ignore: true\n"; + } return "\nIndex-File: true\nFail-Ignore: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); } |