diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-12-29 12:12:01 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-12-31 02:29:20 +0100 |
| commit | 0c646119dea438abb3ee8797994d016ba6834cd2 (patch) | |
| tree | b511c1be09ce7984c06f524b0bebf91d49f0d552 /apt-private | |
| parent | 0161280405fe5aa256dc9df6a56106dd3a1a6f38 (diff) | |
add --indep-only for build-dep command
The implementation is quite different compared to --arch-only due to ABI
reasons but functionality wise they are similar and usually both
available for symmetry at least.
Closes: #845775
Diffstat (limited to 'apt-private')
| -rw-r--r-- | apt-private/private-cmndline.cc | 3 | ||||
| -rw-r--r-- | apt-private/private-source.cc | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index d0cda08a6..dcd7e1bae 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -220,6 +220,8 @@ static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const addArg('P', "build-profiles", "APT::Build-Profiles", CommandLine::HasArg); addArg(0, "purge", "APT::Get::Purge", 0); addArg(0, "solver", "APT::Solver", CommandLine::HasArg); + addArg(0,"arch-only","APT::Get::Arch-Only",0); + addArg(0,"indep-only","APT::Get::Indep-Only",0); // this has no effect *but* sbuild is using it (see LP: #1255806) // once sbuild is fixed, this option can be removed addArg('f', "fix-broken", "APT::Get::Fix-Broken", 0); @@ -270,7 +272,6 @@ static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const addArg(0,"trivial-only","APT::Get::Trivial-Only",0); addArg(0,"remove","APT::Get::Remove",0); addArg(0,"only-source","APT::Get::Only-Source",0); - addArg(0,"arch-only","APT::Get::Arch-Only",0); addArg(0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0); addArg(0,"allow-insecure-repositories","Acquire::AllowInsecureRepositories",0); addArg(0,"allow-weak-repositories","Acquire::AllowWeakRepositories",0); diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc index 68935d97d..5cd0a6628 100644 --- a/apt-private/private-source.cc +++ b/apt-private/private-source.cc @@ -608,9 +608,14 @@ static void WriteBuildDependencyPackage(std::ostringstream &buildDepsPkgFile, << "Architecture: " << Arch << "\n" << "Version: 1\n"; + bool const IndepOnly = _config->FindB("APT::Get::Indep-Only", false); std::string depends, conflicts; for (auto const &dep: Dependencies) { + // ArchOnly is handled while parsing the dependencies on input + if (IndepOnly && (dep.Type == pkgSrcRecords::Parser::BuildDependArch || + dep.Type == pkgSrcRecords::Parser::BuildConflictArch)) + continue; std::string * type; if (dep.Type == pkgSrcRecords::Parser::BuildConflict || dep.Type == pkgSrcRecords::Parser::BuildConflictIndep || |