]> git.saurik.com Git - apt.git/commitdiff
merged from apt-get-download
authorMichael Vogt <michael.vogt@ubuntu.com>
Thu, 18 Nov 2010 13:34:57 +0000 (14:34 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Thu, 18 Nov 2010 13:34:57 +0000 (14:34 +0100)
1  2 
cmdline/apt-get.cc

index eb3ac425b052d01120b30a8a6823fca64c1392c6,a1a1b586d1ddb5c4bc91459608dbeb253b49816a..6e1a5280ce2310b148dc233c2c8b235d3d6e4bdb
@@@ -2165,60 -2165,6 +2165,59 @@@ bool DoAutoClean(CommandLine &CmdL
        Cleaner.Go(_config->FindDir("Dir::Cache::archives") + "partial/",*Cache);
  }
                                                                        /*}}}*/
-    bool result = true;
 +// DoDownload - download a binary                                     /*{{{*/
 +// ---------------------------------------------------------------------
 +bool DoDownload(CommandLine &CmdL)
 +{
 +   CacheFile Cache;
 +   if (Cache.ReadOnlyOpen() == false)
 +      return false;
 +   
 +   APT::CacheSetHelper helper(c0out);
 +   APT::VersionSet verset = APT::VersionSet::FromCommandLine(Cache,
 +              CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper);
 +   pkgAcquire Fetcher;
 +   AcqTextStatus Stat(ScreenWidth, _config->FindI("quiet",0));
 +   Fetcher.Setup(&Stat);
 +
 +   if (verset.empty() == true)
 +      return false;
 +
-       result &= (Fetcher.Run() == pkgAcquire::Continue);
 +   pkgRecords Recs(Cache);
 +   pkgSourceList *SrcList = Cache.GetSourceList();
 +   for (APT::VersionSet::const_iterator Ver = verset.begin(); 
 +        Ver != verset.end(); 
 +        ++Ver) 
 +   {
 +      string descr;
 +      // get the right version
 +      pkgCache::PkgIterator Pkg = Ver.ParentPkg();
 +      pkgRecords::Parser &rec=Recs.Lookup(Ver.FileList());
 +      pkgCache::VerFileIterator Vf = Ver.FileList();
 +      if (Vf.end() == true)
 +         return _error->Error("Can not find VerFile");
 +      pkgCache::PkgFileIterator F = Vf.File();
 +      pkgIndexFile *index;
 +      if(SrcList->FindIndex(F, index) == false)
 +         return _error->Error("FindIndex failed");
 +      string uri = index->ArchiveURI(rec.FileName());
 +      strprintf(descr, _("Downloading %s %s"), Pkg.Name(), Ver.VerStr());
 +      // get the most appropriate hash
 +      HashString hash;
 +      if (rec.SHA256Hash() != "")
 +         hash = HashString("sha256", rec.SHA256Hash());
 +      else if (rec.SHA1Hash() != "")
 +         hash = HashString("sha1", rec.SHA1Hash());
 +      else if (rec.MD5Hash() != "")
 +         hash = HashString("md5", rec.MD5Hash());
 +      // get the file
 +      new pkgAcqFile(&Fetcher, uri, hash.toStr(), (*Ver)->Size, descr, Pkg.Name(), ".");
 +   }
++   bool result = (Fetcher.Run() == pkgAcquire::Continue);
 +
 +   return result;
 +}
 +                                                                      /*}}}*/
  // DoCheck - Perform the check operation                              /*{{{*/
  // ---------------------------------------------------------------------
  /* Opening automatically checks the system, this command is mostly used