doc/po/pt.po: updated, thanks to Américo Monteir

[apt.git] / cmdline / apt-helper.cc

diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index d66b3ffae1d61cd21188d2915a394b475df70c83..b0edafcbd08224f70d6fd31feabbcb33b3c0e324 100644 (file)
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -19,6 +19,7 @@
 
 #include <apt-private/acqprogress.h>
 #include <apt-private/private-output.h>
 
 #include <apt-private/acqprogress.h>
 #include <apt-private/private-output.h>

+#include <apt-private/private-download.h>

 #include <apt-private/private-cmndline.h>
 
 #include <iostream>
 #include <apt-private/private-cmndline.h>
 
 #include <iostream>


@@ -27,7 +28,6 @@
 
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/

-using namespace std;

 
 static bool DoDownloadFile(CommandLine &CmdL)
 {
 
 static bool DoDownloadFile(CommandLine &CmdL)
 {


@@ -40,26 +40,29 @@ static bool DoDownloadFile(CommandLine &CmdL)
    Fetcher.Setup(&Stat);
    std::string download_uri = CmdL.FileList[1];
    std::string targetfile = CmdL.FileList[2];
    Fetcher.Setup(&Stat);
    std::string download_uri = CmdL.FileList[1];
    std::string targetfile = CmdL.FileList[2];

-   new pkgAcqFile(&Fetcher, download_uri, "", 0, "desc", "short-desc", 
+   std::string hash;
+   if (CmdL.FileSize() > 3)
+      hash = CmdL.FileList[3];
+   // we use download_uri as descr and targetfile as short-descr
+   new pkgAcqFile(&Fetcher, download_uri, hash, 0, download_uri, targetfile, 

                   "dest-dir-ignored", targetfile);
    Fetcher.Run();
                   "dest-dir-ignored", targetfile);
    Fetcher.Run();

-   if (!FileExists(targetfile))
-   {
-      _error->Error(_("Download Failed"));
-      return false;
-   }
+   bool Failed = false;
+   if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true ||
+        FileExists(targetfile) == false)
+      return _error->Error(_("Download Failed"));

    return true;
 }
 
 static bool ShowHelp(CommandLine &)
 {
    return true;
 }
 
 static bool ShowHelp(CommandLine &)
 {

-   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
+   ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,

            COMMON_ARCH,__DATE__,__TIME__);
 
    if (_config->FindB("version") == true)
      return true;
 
            COMMON_ARCH,__DATE__,__TIME__);
 
    if (_config->FindB("version") == true)
      return true;
 

-   cout << 
+   std::cout <<

     _("Usage: apt-helper [options] command\n"
       "       apt-helper [options] download-file uri target-path\n"
       "\n"
     _("Usage: apt-helper [options] command\n"
       "       apt-helper [options] download-file uri target-path\n"
       "\n"