diff options
| author | Junichi Uekawa <dancer@netfort.gr.jp> | 2008-08-11 23:40:33 +0900 |
|---|---|---|
| committer | Junichi Uekawa <dancer@netfort.gr.jp> | 2008-08-11 23:40:33 +0900 |
| commit | d154d33fea06d7a7be40775b4063ae8250312761 (patch) | |
| tree | 65d6f9e4abed1abddb3befa44c2dfe822f872221 /pbuilder-satisfydepends-checkparams | |
| parent | 98960e2003834913df870d96a4f7ceabc6fac2c9 (diff) | |
| download | pbuilder-d154d33fea06d7a7be40775b4063ae8250312761.tar pbuilder-d154d33fea06d7a7be40775b4063ae8250312761.tar.gz | |
Reorder command-line options, and add error check so that things are better checked.
--internal-chrootexec "${CHROOTEXEC}" --chroot "${BUILDPLACE}" will always override --internal-chrootexec command,
--chroot "${BUILDPLACE}" --internal-chrootexec "${CHROOTEXEC}" is better.
Diffstat (limited to 'pbuilder-satisfydepends-checkparams')
| -rwxr-xr-x | pbuilder-satisfydepends-checkparams | 11 |
1 files changed, 9 insertions, 2 deletions
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 |