diff options
| -rw-r--r-- | pbuilder-buildpackage-funcs | 2 | ||||
| -rw-r--r-- | pbuilder-satisfydepends-gdebi | 63 |
2 files changed, 8 insertions, 57 deletions
diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs index 5cdbe40..a36fcb4 100644 --- a/pbuilder-buildpackage-funcs +++ b/pbuilder-buildpackage-funcs @@ -37,7 +37,7 @@ function checkbuilddep () { yes) BUILDOPT="--binary-arch";; *) ;; esac - if "$PBUILDERSATISFYDEPENDSCMD" --control "$1" --chroot "${BUILDPLACE}" --internal-chrootexec "${CHROOTEXEC}" "${BUILDOPT}" ; then + if "$PBUILDERSATISFYDEPENDSCMD" --control "$1" --internal-chrootexec "${CHROOTEXEC}" "${BUILDOPT}" ; then : else # If asked to preserve the build place, and pbuilder-satisfydepends diff --git a/pbuilder-satisfydepends-gdebi b/pbuilder-satisfydepends-gdebi index cdb192b..600aa2a 100644 --- a/pbuilder-satisfydepends-gdebi +++ b/pbuilder-satisfydepends-gdebi @@ -1,6 +1,6 @@ #!/bin/bash # pbuilder -- personal Debian package builder -# Copyright (C) 2001,2002,2003,2005-2006 Junichi Uekawa +# Copyright (C) 2001,2002,2003,2005-2007 Junichi Uekawa # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,59 +22,10 @@ set -e +function checkbuilddep_internal () { + $CHROOTEXEC apt-get -y --force-yes install gdebi + INSTALL=$($CHROOTEXEC /usr/bin/gdebi --quiet --apt-line $DEBIAN_CONTROL) + $CHROOTEXEC /usr/bin/apt-get install -y $INSTALL +} - -DEBIAN_CONTROL=debian/control -CHROOT="" -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) - CHROOT="$2" - 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 - -INSTALL=$(/usr/bin/gdebi --quiet --apt-line --root $CHROOT $DEBIAN_CONTROL) -$CHROOTEXEC /usr/bin/apt-get install -y $INSTALL
\ No newline at end of file +. /usr/lib/pbuilder/pbuilder-satisfydepends-checkparams |