eipp: add Allow-Temporary-Remove-of-Essentials

[apt.git] / methods / file.cc

diff --git a/methods/file.cc b/methods/file.cc
index 4e3410078fd734ec3eca282e4f61692f3a801733..5cbf1924ed37a188062a632ab7433b5289025005 100644 (file)
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -15,7 +15,6 @@
 // Include Files                                                       /*{{{*/
 #include <config.h>
 
 // Include Files                                                       /*{{{*/
 #include <config.h>
 

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

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


@@ -98,7 +97,7 @@ bool FileMethod::Fetch(FetchItem *Itm)
    {
       if (APT::String::Endswith(File, *ext) == true)
       {
    {
       if (APT::String::Endswith(File, *ext) == true)
       {

-        std::string const unfile = File.substr(0, File.length() - ext->length() - 1);
+        std::string const unfile = File.substr(0, File.length() - ext->length());

         if (stat(unfile.c_str(),&Buf) == 0)
         {
            AltRes.Size = Buf.st_size;
         if (stat(unfile.c_str(),&Buf) == 0)
         {
            AltRes.Size = Buf.st_size;


@@ -129,8 +128,5 @@ bool FileMethod::Fetch(FetchItem *Itm)
 
 int main()
 {
 
 int main()
 {

-   setlocale(LC_ALL, "");
-
-   FileMethod Mth;
-   return Mth.Run();
+   return FileMethod().Run();

 }
 }