diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-01-15 02:45:35 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-01-15 02:45:35 +0100 |
| commit | feb674aba51dcb26f5281b5b38fbc5893f757170 (patch) | |
| tree | 27a245c075ccd08f9e401cc0222c92918663bb0d | |
| parent | 62428dbc17ffa7b5b8188e88609a9438428d6024 (diff) | |
revert file-hash based action-merging in acquire
Introduced in 9d2a8a7388cf3b0bbbe92f6b0b30a533e1167f40 apt tries to
merge actions like downloading the same (as judged by hashes) file
into doing it once. The implementation was very simple in that it isn't
planing at all. Turns out that it works 90% of the time just fine, but
has issues in more complicated situations in which items can be in
different stages downloading different files emitting potentially the
"wrong" hash – like while pdiffs are worked on we might end up copying
the patch instead of the result file giving us very strange errors in
return. Reverting the change until we can implement a better planing
solution seems to be the best course of action even if its sad.
Closes: 810046
| -rw-r--r-- | apt-pkg/acquire.cc | 3 | ||||
| -rwxr-xr-x | test/integration/skip-acquire-same-repository-multiple-times (renamed from test/integration/test-acquire-same-repository-multiple-times) | 0 |
2 files changed, 1 insertions, 2 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 7a483f272..e515255ae 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -839,9 +839,8 @@ bool pkgAcquire::Queue::Enqueue(ItemDesc &Item) { QItem **I = &Items; // move to the end of the queue and check for duplicates here - HashStringList const hsl = Item.Owner->GetExpectedHashes(); for (; *I != 0; I = &(*I)->Next) - if (Item.URI == (*I)->URI || hsl == (*I)->Owner->GetExpectedHashes()) + if (Item.URI == (*I)->URI) { if (_config->FindB("Debug::pkgAcquire::Worker",false) == true) std::cerr << " @ Queue: Action combined for " << Item.URI << " and " << (*I)->URI << std::endl; diff --git a/test/integration/test-acquire-same-repository-multiple-times b/test/integration/skip-acquire-same-repository-multiple-times index c8372bd41..c8372bd41 100755 --- a/test/integration/test-acquire-same-repository-multiple-times +++ b/test/integration/skip-acquire-same-repository-multiple-times |