diff options
| -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 |