From d154d33fea06d7a7be40775b4063ae8250312761 Mon Sep 17 00:00:00 2001
From: Junichi Uekawa <dancer@netfort.gr.jp>
Date: Mon, 11 Aug 2008 23:40:33 +0900
Subject: 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.
---
 pbuilder-buildpackage-funcs         |  2 +-
 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
-- 
cgit v1.2.3