diff options
| author | Julian Andres Klode <jak@debian.org> | 2024-11-14 18:39:54 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2024-11-14 18:39:54 +0000 |
| commit | f7fb7fb921c3bbfa0ef086b0cc9343d126d0ed09 (patch) | |
| tree | df2a0c967969fe7d899ba9a00af83d776f563cb0 /ftparchive | |
| parent | caf668388f2be7546989c97ab19ec4caeda73c92 (diff) | |
| parent | 0cc32385f109705aac51e354d854833d6203f773 (diff) | |
Merge branch 'svequiv3everything' into 'main'
Prepare for APT::StringView -> std::string_view, #if APT_PKG_ABI > 600: ABI migrations and using APT::StringView = std::string_view;
See merge request apt-team/apt!396
Diffstat (limited to 'ftparchive')
| -rw-r--r-- | ftparchive/writer.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 6d2a13314..dcae84b86 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -829,7 +829,11 @@ bool SourcesWriter::DoPackage(string FileName) std::vector<pkgTagSection::Tag> Changes; Changes.push_back(pkgTagSection::Tag::Remove("Source")); +#if APT_PKG_ABI > 600 + Changes.push_back(pkgTagSection::Tag::Rewrite("Package", Package)); +#else Changes.push_back(pkgTagSection::Tag::Rewrite("Package", std::string{Package})); +#endif if (Files.empty() == false) Changes.push_back(pkgTagSection::Tag::Rewrite("Files", Files)); else |