diff options
| author | Loïc Minier <lool@dooz.org> | 2007-03-31 15:39:08 +0200 |
|---|---|---|
| committer | Loïc Minier <lool@dooz.org> | 2007-03-31 15:39:08 +0200 |
| commit | 8bb7ffe30bf79c6acbfb15c6be34fce5f4a945d7 (patch) | |
| tree | f254c237bae20f0f5d5cf98afdf57e8b348ef583 | |
| parent | 6de7a42e5278688ae51cddd6aa0812f43b361787 (diff) | |
| download | pbuilder-8bb7ffe30bf79c6acbfb15c6be34fce5f4a945d7.tar pbuilder-8bb7ffe30bf79c6acbfb15c6be34fce5f4a945d7.tar.gz | |
* Move command-line parsing logic used in pbuilder-satisfydepends* into
pbuilder-satisfydepends-checkparams.
| -rw-r--r-- | pbuilder-satisfydepends | 54 | ||||
| -rwxr-xr-x | pbuilder-satisfydepends-aptitude | 54 | ||||
| -rwxr-xr-x | pbuilder-satisfydepends-experimental | 54 |
3 files changed, 3 insertions, 159 deletions
diff --git a/pbuilder-satisfydepends b/pbuilder-satisfydepends index 319c1c7..15a14bb 100644 --- a/pbuilder-satisfydepends +++ b/pbuilder-satisfydepends @@ -181,57 +181,5 @@ Copyright 2002-2007 Junichi Uekawa <dancer@debian.org> EOF } +. /usr/lib/pbuilder/pbuilder-satisfydepends-checkparams -DEBIAN_CONTROL=debian/control -CHROOTEXEC="" -BD_REGEXP="build-(depends|depends-indep)" -BC_REGEXP="build-(conflicts|conflicts-indep)" -FORCEVERSION="" -CONTINUE_FAIL="no" - - -while [ -n "$1" ]; do - case "$1" in - --control|-c) - DEBIAN_CONTROL="$2" - shift; shift - ;; - --chroot) - CHROOTEXEC="chroot $2 " - shift; shift - ;; - --internal-chrootexec) - CHROOTEXEC="$2" - shift; shift - ;; - --binary-all) - BD_REGEXP='build-(depends|depends-indep)' - BC_REGEXP='build-(conflicts|conflicts-indep)' - shift - ;; - --binary-arch) - BD_REGEXP='build-depends' - BC_REGEXP='build-conflicts' - shift - ;; - --echo) - CHROOTEXEC="echo $CHROOTEXEC" - shift - ;; - --continue-fail) - CONTINUE_FAIL="yes" - shift - ;; - --force-version) - FORCEVERSION="yes" - shift; - ;; - --help|-h|*) - print_help - exit 1 - ;; - esac -done - - -checkbuilddep_internal diff --git a/pbuilder-satisfydepends-aptitude b/pbuilder-satisfydepends-aptitude index b6353ce..1fb41a3 100755 --- a/pbuilder-satisfydepends-aptitude +++ b/pbuilder-satisfydepends-aptitude @@ -91,57 +91,5 @@ Copyright 2002-2007 Junichi Uekawa <dancer@debian.org> EOF } +. /usr/lib/pbuilder/pbuilder-satisfydepends-checkparams -DEBIAN_CONTROL=debian/control -CHROOTEXEC="" -BD_REGEXP="build-(depends|depends-indep)" -BC_REGEXP="build-(conflicts|conflicts-indep)" -FORCEVERSION="" -CONTINUE_FAIL="no" - - -while [ -n "$1" ]; do - case "$1" in - --control|-c) - DEBIAN_CONTROL="$2" - shift; shift - ;; - --chroot) - CHROOTEXEC="chroot $2 " - shift; shift - ;; - --internal-chrootexec) - CHROOTEXEC="$2" - shift; shift - ;; - --binary-all) - BD_REGEXP='build-(depends|depends-indep)' - BC_REGEXP='build-(conflicts|conflicts-indep)' - shift - ;; - --binary-arch) - BD_REGEXP='build-depends' - BC_REGEXP='build-conflicts' - shift - ;; - --echo) - CHROOTEXEC="echo $CHROOTEXEC" - shift - ;; - --continue-fail) - CONTINUE_FAIL="yes" - shift - ;; - --force-version) - FORCEVERSION="yes" - shift; - ;; - --help|-h|*) - print_help - exit 1 - ;; - esac -done - - -checkbuilddep_internal diff --git a/pbuilder-satisfydepends-experimental b/pbuilder-satisfydepends-experimental index 4fb80b3..b7020ba 100755 --- a/pbuilder-satisfydepends-experimental +++ b/pbuilder-satisfydepends-experimental @@ -202,57 +202,5 @@ Copyright 2002-2007 Junichi Uekawa <dancer@debian.org> EOF } +. /usr/lib/pbuilder/pbuilder-satisfydepends-checkparams -DEBIAN_CONTROL=debian/control -CHROOTEXEC="" -BD_REGEXP="build-(depends|depends-indep)" -BC_REGEXP="build-(conflicts|conflicts-indep)" -FORCEVERSION="" -CONTINUE_FAIL="no" - - -while [ -n "$1" ]; do - case "$1" in - --control|-c) - DEBIAN_CONTROL="$2" - shift; shift - ;; - --chroot) - CHROOTEXEC="chroot $2 " - shift; shift - ;; - --internal-chrootexec) - CHROOTEXEC="$2" - shift; shift - ;; - --binary-all) - BD_REGEXP='build-(depends|depends-indep)' - BC_REGEXP='build-(conflicts|conflicts-indep)' - shift - ;; - --binary-arch) - BD_REGEXP='build-depends' - BC_REGEXP='build-conflicts' - shift - ;; - --echo) - CHROOTEXEC="echo $CHROOTEXEC" - shift - ;; - --continue-fail) - CONTINUE_FAIL="yes" - shift - ;; - --force-version) - FORCEVERSION="yes" - shift; - ;; - --help|-h|*) - print_help - exit 1 - ;; - esac -done - - -checkbuilddep_internal |