summaryrefslogtreecommitdiff
path: root/apt-pkg/acquire-worker.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-10-07 17:47:30 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-10-07 17:47:30 +0200
commitc48eea97b93920062ea26001081d4fdf7eb967e3 (patch)
tree84e5609e0f35579a8ccca029794555fd6c0bbc80 /apt-pkg/acquire-worker.cc
parentc86bc8515a3a195aa244a1743476b102d72c9a2a (diff)
make expected-size a maximum-size check as this is what we want at this point
Diffstat (limited to 'apt-pkg/acquire-worker.cc')
-rw-r--r--apt-pkg/acquire-worker.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 8bd1618f4..ffa84eb68 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -526,9 +526,6 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item)
if (OutFd == -1)
return false;
- string ExpectedSize;
- strprintf(ExpectedSize, "%llu", Item->Owner->FileSize);
-
string Message = "600 URI Acquire\n";
Message.reserve(300);
Message += "URI: " + Item->URI;
@@ -536,7 +533,12 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item)
HashStringList const hsl = Item->Owner->HashSums();
for (HashStringList::const_iterator hs = hsl.begin(); hs != hsl.end(); ++hs)
Message += "\nExpected-" + hs->HashType() + ": " + hs->HashValue();
- Message += "\nExpected-Size: " + ExpectedSize;
+ if(Item->Owner->FileSize > 0)
+ {
+ string MaximumSize;
+ strprintf(MaximumSize, "%llu", Item->Owner->FileSize);
+ Message += "\nMaximum-Size: " + MaximumSize;
+ }
Message += Item->Owner->Custom600Headers();
Message += "\n\n";