summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-08-24 16:16:49 -0700
committerMichael Vogt <mvo@debian.org>2014-08-24 16:16:49 -0700
commitd4ab7e9c6ee81f4d81e4c3c54395fe1af4d1e7b4 (patch)
tree650d764a9a95229174a2ba7df23c648b024029af
parent5f6c6c6e085bcba021a29d88859e70b1e03ff153 (diff)
make the test-pdiff-usage code work again
-rw-r--r--apt-pkg/acquire-item.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index d5cce8c49..fcfdd50ea 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -676,12 +676,21 @@ void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig * /*Cnf*/)
// Finish - helper that cleans the item out of the fetcher queue /*{{{*/
void pkgAcqIndexDiffs::Finish(bool allDone)
{
+ if(Debug)
+ std::clog << "pkgAcqIndexDiffs::Finish(): "
+ << allDone << " "
+ << Desc.URI << std::endl;
+
// we restore the original name, this is required, otherwise
// the file will be cleaned
if(allDone)
{
DestFile = _config->FindDir("Dir::State::lists");
DestFile += URItoFileName(RealURI);
+
+ // FIXME: we want the rred stuff to use the real transactional update
+ // this is just a workaround
+ PartialFile = DestFile;
if(HashSums().usable() && !HashSums().VerifyFile(DestFile))
{
@@ -929,6 +938,8 @@ void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,HashStri
// otherwise lists cleanup will eat the file
DestFile = FinalFile;
+ // FIXME: make the merged rred code really transactional
+ PartialFile = FinalFile;
// ensure the ed's are gone regardless of list-cleanup
for (std::vector<pkgAcqIndexMergeDiffs *>::const_iterator I = allPatches->begin();