From f798994af1d760954fb6e8d0be0d17e60862e479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= Date: Mon, 4 Jan 2010 16:49:59 +0100 Subject: Simpler logic for inclusion of -Indep build-deps Set BINARY_ARCH in pbuilder-satisfydepends-checkparams just as in pbuilder-checkparams instead of setting BC_REGEXP and BD_REGEXP and change get_build_deps and get_build_conflicts to query for Build-Deps / Build-Conflicts only, with an optional separate get_control_re call for the -Indep deps if needed. Update testsuite to also test for build-deps-indep. --- pbuilder-satisfydepends-checkparams | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'pbuilder-satisfydepends-checkparams') diff --git a/pbuilder-satisfydepends-checkparams b/pbuilder-satisfydepends-checkparams index 733fdd4..16e418d 100755 --- a/pbuilder-satisfydepends-checkparams +++ b/pbuilder-satisfydepends-checkparams @@ -22,8 +22,7 @@ DEBIAN_CONTROL=debian/control CHROOT="" CHROOTEXEC="" -BD_REGEXP="build-(depends|depends-indep)" -BC_REGEXP="build-(conflicts|conflicts-indep)" +BINARY_ARCH="no" FORCEVERSION="" CONTINUE_FAIL="no" CHROOTEXEC_AFTER_INTERNAL_CHROOTEXEC=no @@ -58,13 +57,11 @@ while [ -n "$1" ]; do ;; --binary-all) - BD_REGEXP='build-(depends|depends-indep)' - BC_REGEXP='build-(conflicts|conflicts-indep)' + BINARY_ARCH="no" shift ;; --binary-arch) - BD_REGEXP='build-depends' - BC_REGEXP='build-conflicts' + BINARY_ARCH="yes" shift ;; --continue-fail) -- cgit v1.2.3