Don't download "optional" files not in Release :/.

[apt.git] / methods / https.cc

diff --git a/methods/https.cc b/methods/https.cc
index 283126f6b3e1a01f6fcc4e36edc544bed3fc530f..b2d05136cd769ab1d55c7f0d6efe726cf40efcde 100644 (file)
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -382,8 +382,15 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
         headers = curl_slist_append(headers, "Accept: text/*");
    }
 
         headers = curl_slist_append(headers, "Accept: text/*");
    }
 

+   // go for it - if the file exists, append on it
+   File = new FileFd(Itm->DestFile, FileFd::WriteAny);
+   if (Server == nullptr || Server->Comp(Itm->Uri) == false)
+      Server = CreateServerState(Itm->Uri);
+   else
+      Server->Reset(false);
+

    // if we have the file send an if-range query with a range header
    // if we have the file send an if-range query with a range header

-   if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
+   if (Server->RangesAllowed && stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)

    {
       std::string Buf;
       strprintf(Buf, "Range: bytes=%lli-", (long long) SBuf.st_size);
    {
       std::string Buf;
       strprintf(Buf, "Range: bytes=%lli-", (long long) SBuf.st_size);


@@ -397,9 +404,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
       curl_easy_setopt(curl, CURLOPT_TIMEVALUE, Itm->LastModified);
    }
 
       curl_easy_setopt(curl, CURLOPT_TIMEVALUE, Itm->LastModified);
    }
 

-   // go for it - if the file exists, append on it
-   File = new FileFd(Itm->DestFile, FileFd::WriteAny);
-   Server = CreateServerState(Itm->Uri);

    if (Server->InitHashes(Itm->ExpectedHashes) == false)
       return false;
 
    if (Server->InitHashes(Itm->ExpectedHashes) == false)
       return false;