http: clear content before reporting the failure

[apt.git] / methods / mirror.cc

diff --git a/methods/mirror.cc b/methods/mirror.cc
index 977eddcf55a236cde7f9a6f2b3fd99e77bc0c878..71faaf5916962bb659a0b2a2444d6d3a0699217a 100644 (file)
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -12,22 +12,21 @@
 
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/fileutl.h>
 
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/fileutl.h>

-#include <apt-pkg/acquire-method.h>

 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-item.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/error.h>

-#include <apt-pkg/hashes.h>

 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/metaindex.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/metaindex.h>

+#include <apt-pkg/strutl.h>

 
 

+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>

 #include <algorithm>
 #include <algorithm>

-#include <fstream>

 #include <iostream>
 #include <iostream>

-
-#include <stdarg.h>
+#include <fstream>

 #include <sys/stat.h>
 #include <sys/stat.h>

-#include <sys/types.h>

 #include <sys/utsname.h>
 #include <dirent.h>
 
 #include <sys/utsname.h>
 #include <dirent.h>
 


@@ -58,7 +57,7 @@ using namespace std;
  */
 
 MirrorMethod::MirrorMethod()
  */
 
 MirrorMethod::MirrorMethod()

-   : HttpMethod(), DownloadedMirrorFile(false), Debug(false)
+   : HttpMethod("mirror"), DownloadedMirrorFile(false), Debug(false)

 {
 }
 
 {
 }
 


@@ -69,7 +68,7 @@ bool MirrorMethod::Configuration(string Message)
 {
    if (pkgAcqMethod::Configuration(Message) == false)
       return false;
 {
    if (pkgAcqMethod::Configuration(Message) == false)
       return false;

-   Debug = _config->FindB("Debug::Acquire::mirror",false);
+   Debug = DebugEnabled();

    
    return true;
 }
    
    return true;
 }


@@ -106,6 +105,7 @@ bool MirrorMethod::Clean(string Dir)
       // Skip some files..
       if (strcmp(Dir->d_name,"lock") == 0 ||
          strcmp(Dir->d_name,"partial") == 0 ||
       // Skip some files..
       if (strcmp(Dir->d_name,"lock") == 0 ||
          strcmp(Dir->d_name,"partial") == 0 ||

+         strcmp(Dir->d_name,"lost+found") == 0 ||

          strcmp(Dir->d_name,".") == 0 ||
          strcmp(Dir->d_name,"..") == 0)
         continue;
          strcmp(Dir->d_name,".") == 0 ||
          strcmp(Dir->d_name,"..") == 0)
         continue;


@@ -122,7 +122,7 @@ bool MirrorMethod::Clean(string Dir)
       }
       // nothing found, nuke it
       if (I == list.end())
       }
       // nothing found, nuke it
       if (I == list.end())

-        unlink(Dir->d_name);
+        RemoveFile("mirror", Dir->d_name);

    }
 
    closedir(D);
    }
 
    closedir(D);


@@ -132,7 +132,7 @@ bool MirrorMethod::Clean(string Dir)
 }
 
 
 }
 
 

-bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
+bool MirrorMethod::DownloadMirrorFile(string /*mirror_uri_str*/)

 {
    // not that great to use pkgAcquire here, but we do not have
    // any other way right now
 {
    // not that great to use pkgAcquire here, but we do not have
    // any other way right now


@@ -464,11 +464,7 @@ void MirrorMethod::URIDone(FetchResult &Res,FetchResult *Alt)
 
 int main()
 {
 
 int main()
 {

-   setlocale(LC_ALL, "");
-
-   MirrorMethod Mth;
-
-   return Mth.Loop();
+   return MirrorMethod().Loop();

 }
 
 
 }