diff options
| -rw-r--r-- | pbuilder-buildpackage-funcs | 2 | ||||
| -rwxr-xr-x | pbuilder-satisfydepends-checkparams | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs index 780ff21..5cdbe40 100644 --- a/pbuilder-buildpackage-funcs +++ b/pbuilder-buildpackage-funcs @@ -37,7 +37,7 @@ function checkbuilddep () { yes) BUILDOPT="--binary-arch";; *) ;; esac - if "$PBUILDERSATISFYDEPENDSCMD" --control "$1" --internal-chrootexec "${CHROOTEXEC}" --chroot "${BUILDPLACE}" "${BUILDOPT}" ; then + if "$PBUILDERSATISFYDEPENDSCMD" --control "$1" --chroot "${BUILDPLACE}" --internal-chrootexec "${CHROOTEXEC}" "${BUILDOPT}" ; then : else # If asked to preserve the build place, and pbuilder-satisfydepends diff --git a/pbuilder-satisfydepends-checkparams b/pbuilder-satisfydepends-checkparams index 3314c64..f545828 100755 --- a/pbuilder-satisfydepends-checkparams +++ b/pbuilder-satisfydepends-checkparams @@ -25,7 +25,7 @@ BD_REGEXP="build-(depends|depends-indep)" BC_REGEXP="build-(conflicts|conflicts-indep)" FORCEVERSION="" CONTINUE_FAIL="no" - +CHROOTEXEC_AFTER_INTERNAL_CHROOTEXEC=no while [ -n "$1" ]; do case "$1" in @@ -33,12 +33,20 @@ while [ -n "$1" ]; do DEBIAN_CONTROL="$2" shift; shift ;; + + # --chroot option and --internal-chrootexec options conflict with each other. + # --chroot) CHROOTEXEC="chroot $2 " + if [ ${CHROOTEXEC_AFTER_INTERNAL_CHROOTEXEC} = maybe ]; then + echo '--chroot specified after --internal-chrootexec' >&2 + exit 1 + fi shift; shift ;; --internal-chrootexec) CHROOTEXEC="$2" + CHROOTEXEC_AFTER_INTERNAL_CHROOTEXEC=maybe shift; shift ;; --binary-all) @@ -70,5 +78,4 @@ while [ -n "$1" ]; do esac done - checkbuilddep_internal |