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. --- test_pbuilder-satisfydepends-funcs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'test_pbuilder-satisfydepends-funcs') diff --git a/test_pbuilder-satisfydepends-funcs b/test_pbuilder-satisfydepends-funcs index 5512bd6..9ce38c7 100755 --- a/test_pbuilder-satisfydepends-funcs +++ b/test_pbuilder-satisfydepends-funcs @@ -6,7 +6,6 @@ # testsuite to test pbuilder-satisfydepends-funcs. DEBIAN_CONTROL="" -BD_REGEXP="build-(depends|depends-indep)" cleanup() { if [ -n "$DEBIAN_CONTROL" ]; then @@ -15,6 +14,10 @@ cleanup() { } test_get_build_deps() { + local BINARY_ARCH + + BINARY_ARCH="$1" + cat <"$DEBIAN_CONTROL" Source: amule XXXX: @@ -43,6 +46,9 @@ trap cleanup sigpipe sighup exit DEBIAN_CONTROL="$(tempfile)" expect_output " autotools-dev, debhelper, quilt, libwxgtk2.8-dev - test, test1, test2, test3 | test4, test5" test_get_build_deps + test, test1, test2, test3 | test4, test5" \ + test_get_build_deps "no" +expect_output " autotools-dev, debhelper, quilt, libwxgtk2.8-dev" \ + test_get_build_deps "yes" testlib_summary -- cgit v1.2.3