diff options
| author | Loïc Minier <lool@dooz.org> | 2010-01-04 16:49:59 +0100 |
|---|---|---|
| committer | Loïc Minier <lool@dooz.org> | 2010-01-04 16:52:34 +0100 |
| commit | f798994af1d760954fb6e8d0be0d17e60862e479 (patch) | |
| tree | ccd95e44a6e805111730378debc249f2a3d9c783 /pbuilder-satisfydepends-checkparams | |
| parent | 35a94e9d9dc8d73d071c65e54e4f68353df0aa7e (diff) | |
| download | pbuilder-f798994af1d760954fb6e8d0be0d17e60862e479.tar pbuilder-f798994af1d760954fb6e8d0be0d17e60862e479.tar.gz | |
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.
Diffstat (limited to 'pbuilder-satisfydepends-checkparams')
| -rwxr-xr-x | pbuilder-satisfydepends-checkparams | 9 |
1 files changed, 3 insertions, 6 deletions
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) |