From c5f22e483cc0f31f2938874370ac776e40792069 Mon Sep 17 00:00:00 2001 From: Johannes Schauer Date: Wed, 9 Nov 2016 15:28:15 +0100 Subject: add support for Build-Depends/Conflicts-Arch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These new enum values might cause "interesting" behaviour in tools not expecting them – like an old apt would think a Build-Conflicts-Arch is some sort of Build-Depends – but that can't reasonably be avoided and effects only packages using B-D/C-A so if there is any breakage the tools can easily be adapted. The APT_PKG_RELEASE number is increased so that libapt users can detect the availability of these new enum fields via: #if APT_PKG_ABI > 500 || (APT_PKG_ABI == 500 && APT_PKG_RELEASE >= 1) Closes: #837395 --- apt-private/private-source.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'apt-private/private-source.cc') diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc index fab1b4532..1e819a668 100644 --- a/apt-private/private-source.cc +++ b/apt-private/private-source.cc @@ -620,7 +620,9 @@ static void WriteBuildDependencyPackage(std::ostringstream &buildDepsPkgFile, for (auto const &dep: Dependencies) { std::string * type; - if (dep.Type == pkgSrcRecords::Parser::BuildConflict || dep.Type == pkgSrcRecords::Parser::BuildConflictIndep) + if (dep.Type == pkgSrcRecords::Parser::BuildConflict || + dep.Type == pkgSrcRecords::Parser::BuildConflictIndep || + dep.Type == pkgSrcRecords::Parser::BuildConflictArch) type = &conflicts; else type = &depends; -- cgit v1.2.3