diff options
| author | Johannes Schauer <josch@debian.org> | 2016-11-09 15:28:15 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-11-09 16:18:54 +0100 |
| commit | c5f22e483cc0f31f2938874370ac776e40792069 (patch) | |
| tree | ff6f63b7fd4f6cd84908c7b4d890e5872b64f002 /apt-private | |
| parent | 9444da765692b9f49a06720b5a75a168d6552c1c (diff) | |
add support for Build-Depends/Conflicts-Arch
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
Diffstat (limited to 'apt-private')
| -rw-r--r-- | apt-private/private-source.cc | 4 |
1 files changed, 3 insertions, 1 deletions
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; |