* buildlib/systemtable, configure.in:

[apt.git] / methods / ftp.cc

diff --git a/methods/ftp.cc b/methods/ftp.cc
index b744d9882f7d888967eebbc9bacd34fedc3286bd..0c2aa00a76a599fc5c0dea110862db30b3fd5d08 100644 (file)
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -229,7 +229,7 @@ bool FTPConn::Login()
       if (ReadResp(Tag,Msg) == false)
         return false;
       if (Tag >= 400)
       if (ReadResp(Tag,Msg) == false)
         return false;
       if (Tag >= 400)

-        return _error->Error(_("Server refused our connection and said: %s"),Msg.c_str());
+        return _error->Error(_("The server refused the connection and said: %s"),Msg.c_str());

       
       // Perform proxy script execution
       Configuration::Item const *Opts = _config->Tree("Acquire::ftp::ProxyLogin");
       
       // Perform proxy script execution
       Configuration::Item const *Opts = _config->Tree("Acquire::ftp::ProxyLogin");


@@ -1055,9 +1055,12 @@ bool FtpMethod::Fetch(FetchItem *Itm)
         UBuf.modtime = FailTime;
         utime(FailFile.c_str(),&UBuf);
         
         UBuf.modtime = FailTime;
         utime(FailFile.c_str(),&UBuf);
         

-        // If the file is missing we hard fail otherwise transient fail
-        if (Missing == true)
+        // If the file is missing we hard fail and delete the destfile
+        // otherwise transient fail
+        if (Missing == true) {
+           unlink(FailFile.c_str());

            return false;
            return false;

+        }

         Fail(true);
         return true;
       }
         Fail(true);
         return true;
       }


@@ -1102,7 +1105,7 @@ int main(int argc,const char *argv[])
         
         // Run the http method
         string Path = flNotFile(argv[0]) + "http";
         
         // Run the http method
         string Path = flNotFile(argv[0]) + "http";

-        execl(Path.c_str(),Path.c_str(),0);
+        execl(Path.c_str(),Path.c_str(),(char *)NULL);

         cerr << _("Unable to invoke ") << Path << endl;
         exit(100);
       }      
         cerr << _("Unable to invoke ") << Path << endl;
         exit(100);
       }