Update with files from apt-sarge. Complete French translation.

[apt.git] / apt-pkg / acquire-item.cc

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index d1bed417be17448280f40dfe150a866195336c77..de8cfe8f2249e2b74d2aeccd46b93264663bcf94 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -321,6 +321,10 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
    DestFile = _config->FindDir("Dir::State::lists") + "partial/";
    DestFile += URItoFileName(URI);
 
+   // remove any partial downloaded sig-file. it may confuse proxies
+   // and is too small to warrant a partial download anyway
+   unlink(DestFile.c_str());
+
    // Create the item
    Desc.Description = URIDesc;
    Desc.Owner = this;
@@ -346,6 +350,13 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
 /* The only header we use is the last-modified header. */
 string pkgAcqMetaSig::Custom600Headers()
 {
+   // mvo: we don't really need the last-modified header here
+   //      1) it points to "Final" and that was renamed to "DestFile" 
+   //         so it's never send anyway
+   //      2) because DestFIle is in partial/ we will send a partial request
+   //         with if-range in the http method (or the equivalent for ftp). 
+   //         that should give the same result
+
    string Final = _config->FindDir("Dir::State::lists");
    Final += URItoFileName(RealURI);
    
@@ -393,15 +404,6 @@ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
    string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
    unlink(Final.c_str());
 
-   // if we debug leave the sig-file in partial/ to see what went wrong
-   // else delete it
-   if (!_config->FindB("Debug::pkgAcquire::Auth", false)) {
-      
-      Final = _config->FindDir("Dir::State::lists") + "partial/"+ URItoFileName(RealURI);
-      unlink(Final.c_str());
-   }
-
-
    // queue a pkgAcqMetaIndex with no sigfile
    new pkgAcqMetaIndex(Owner, MetaIndexURI, MetaIndexURIDesc, MetaIndexShortDesc,
                       "", IndexTargets, MetaIndexParser);