diff options
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/acquire-item.cc | 21 | ||||
| -rw-r--r-- | apt-pkg/indexrecords.cc | 22 |
2 files changed, 34 insertions, 9 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 99013d649..1f3d83941 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1020,6 +1020,27 @@ void pkgAcqIndex::Init(string const &URI, string const &URIDesc, string const &S FileSize = Record->Size; } + // do the request by-hash + if(_config->FindB("APT::Acquire::By-Hash", false) == true && + MetaIndexParser) + { + indexRecords::checkSum *Record = MetaIndexParser->Lookup(MetaKey); + if(Record) + { + // FIXME: make the hash used a config option or read from release file + const HashString *TargetHash = Record->Hashes.find("SHA256"); + std::string ByHash = "/by-hash/" + TargetHash->HashValue(); + size_t trailing_slash = Desc.URI.find_last_of("/"); + Desc.URI = Desc.URI.replace(trailing_slash, + Desc.URI.substr(trailing_slash+1).size()+1, + ByHash); + std::cerr << Desc.URI << std::endl; + } else { + _error->Warning("By-Hash requested but can not find record for %s", + MetaKey.c_str()); + } + } + Desc.Description = URIDesc; Desc.Owner = this; Desc.ShortDesc = ShortDesc; diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index 5dcaadd76..122194e94 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -90,8 +90,8 @@ bool indexRecords::Load(const string Filename) /*{{{*/ Suite = Section.FindS("Suite"); Dist = Section.FindS("Codename"); - int i; - for (i=0;HashString::SupportedHashes()[i] != NULL; i++) + bool FoundHashSum = false; + for (int i=0;HashString::SupportedHashes()[i] != NULL; i++) { if (!Section.Find(HashString::SupportedHashes()[i], Start, End)) continue; @@ -103,16 +103,20 @@ bool indexRecords::Load(const string Filename) /*{{{*/ { if (!parseSumData(Start, End, Name, Hash, Size)) return false; - indexRecords::checkSum *Sum = new indexRecords::checkSum; - Sum->MetaKeyFilename = Name; - Sum->Hashes.push_back(HashString(HashString::SupportedHashes()[i],Hash)); - Sum->Size = Size; - Entries[Name] = Sum; + + if (Entries.find(Name) == Entries.end()) + { + indexRecords::checkSum *Sum = new indexRecords::checkSum; + Sum->MetaKeyFilename = Name; + Sum->Size = Size; + Entries[Name] = Sum; + } + Entries[Name]->Hashes.push_back(HashString(HashString::SupportedHashes()[i],Hash)); + FoundHashSum = true; } - break; } - if(HashString::SupportedHashes()[i] == NULL) + if(FoundHashSum == false) { strprintf(ErrorText, _("No Hash entry in Release file %s"), Filename.c_str()); return false; |