properly handle (currently unused) dpkg pass-through

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

diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index 37279ec..b0edafc 100644 (file)
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -40,11 +40,15 @@ static bool DoDownloadFile(CommandLine &CmdL)
    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();
    bool Failed = false;
-   if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == false ||
+   if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true ||
         FileExists(targetfile) == false)
       return _error->Error(_("Download Failed"));
    return true;