From 0c646119dea438abb3ee8797994d016ba6834cd2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 29 Dec 2016 12:12:01 +0100 Subject: 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 --- apt-private/private-cmndline.cc | 3 ++- apt-private/private-source.cc | 5 +++++ doc/apt-get.8.xml | 7 ++++++- test/integration/test-apt-get-build-dep | 17 +++++++++++++++++ 4 files changed, 30 insertions(+), 2 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 &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 &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 || diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index ff7b38e97..10366f561 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -545,12 +545,17 @@ Configuration Item: APT::Get::Diff-Only, APT::Get::Dsc-Only, and APT::Get::Tar-Only. - + Only process architecture-dependent build-dependencies. Configuration Item: APT::Get::Arch-Only. + + Only process architecture-independent build-dependencies. + Configuration Item: APT::Get::Indep-Only. + + Ignore if packages can't be authenticated and don't prompt about it. This can be useful while working with local repositories, diff --git a/test/integration/test-apt-get-build-dep b/test/integration/test-apt-get-build-dep index 6a3a2b6c2..4fa77961b 100755 --- a/test/integration/test-apt-get-build-dep +++ b/test/integration/test-apt-get-build-dep @@ -68,3 +68,20 @@ Inst build-essential (1 stable [i386]) Conf build-depends (1 stable [i386]) Conf build-depends-arch (1 stable [i386]) Conf build-essential (1 stable [i386])" aptget build-dep --simulate ./foobar.dsc --arch-only + +testsuccessequal "Note, using file './foobar.dsc' to get the build dependencies +Reading package lists... +Building dependency tree... +The following packages will be REMOVED: + build-conflicts build-conflicts-indep +The following NEW packages will be installed: + build-depends build-depends-indep build-essential +0 upgraded, 3 newly installed, 2 to remove and 0 not upgraded. +Remv build-conflicts [1] +Remv build-conflicts-indep [1] +Inst build-depends (1 stable [i386]) +Inst build-depends-indep (1 stable [i386]) +Inst build-essential (1 stable [i386]) +Conf build-depends (1 stable [i386]) +Conf build-depends-indep (1 stable [i386]) +Conf build-essential (1 stable [i386])" aptget build-dep --simulate ./foobar.dsc --indep-only -- cgit v1.2.3