diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-13 19:31:40 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-13 19:31:40 +0000 |
| commit | 4eb0e06fdfbdeff07aa4f49f667ea1a5a92c4a81 (patch) | |
| tree | 8f4f0bd9208e7e7f514c0683f1f18583352f2b2e /apt-pkg/edsp/edsplistparser.cc | |
| parent | Releasing progress-linux version 2.9.4-0.0~progress7.99u1. (diff) | |
| download | apt-4eb0e06fdfbdeff07aa4f49f667ea1a5a92c4a81.tar.xz apt-4eb0e06fdfbdeff07aa4f49f667ea1a5a92c4a81.zip | |
Merging upstream version 2.9.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | apt-pkg/edsp/edsplistparser.cc | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc index 5419069..183ace6 100644 --- a/apt-pkg/edsp/edsplistparser.cc +++ b/apt-pkg/edsp/edsplistparser.cc @@ -44,7 +44,20 @@ edspListParser::edspListParser(FileFd * const File) : edspLikeListParser(File) bool edspLikeListParser::NewVersion(pkgCache::VerIterator &Ver) { _system->SetVersionMapping(Ver->ID, Section.FindI("APT-ID", Ver->ID)); - return debListParser::NewVersion(Ver); + if (not debListParser::NewVersion(Ver)) + return false; + + // Patch up the source version, it is stored in the Source-Version field in EDSP. + if (APT::StringView version = Section.Find(pkgTagSection::Key::Source_Version); not version.empty()) + { + if (version != Ver.VerStr()) + { + map_stringitem_t const idx = StoreString(pkgCacheGenerator::VERSIONNUMBER, version); + Ver->SourceVerStr = idx; + } + } + + return true; } /*}}}*/ // ListParser::Description - Return the description string /*{{{*/ |