diff options
| author | Michael Vogt <mvo@debian.org> | 2014-08-01 19:25:00 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-08-01 19:25:00 +0200 |
| commit | 63d0f85391839a666957add1833e67f7638c8a83 (patch) | |
| tree | ff58549aa9bbd30dd06428ecc422b775274b4731 /apt-pkg | |
| parent | 67f2f9e2ed2f48833926abb7c31cca4a57ebfec1 (diff) | |
make i-m-s work again
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/acquire-item.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index c75ef36a9..a6f69944e 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1164,10 +1164,7 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,HashStringList con // Done, queue for rename on transaction finished PartialFile = DestFile; - string FinalFile = _config->FindDir("Dir::State::lists"); - FinalFile += URItoFileName(RealURI); - DestFile = FinalFile; -#if 0 +#if 1 // FIXME: waaaay too complicated /* We restore the original name to DestFile so that the clean operation will work OK */ DestFile = _config->FindDir("Dir::State::lists") + "partial/"; @@ -1177,6 +1174,12 @@ void pkgAcqIndex::Done(string Message,unsigned long long Size,HashStringList con if (Erase == true) unlink(DestFile.c_str()); #endif + + // Done, queue for rename on transaction finished + string FinalFile = _config->FindDir("Dir::State::lists"); + FinalFile += URItoFileName(RealURI); + DestFile = FinalFile; + return; } else { // FIXME: use the same method to find |