diff options
| author | Junichi Uekawa <dancer@coreduo.netfort.gr.jp> | 2008-01-04 09:25:32 +0900 |
|---|---|---|
| committer | Junichi Uekawa <dancer@coreduo.netfort.gr.jp> | 2008-01-04 09:25:32 +0900 |
| commit | 3b1e38a6d2d68debc8935e510b06f78cb018502f (patch) | |
| tree | 9993dbbf615de30cabf646e294c8f7db38c0264c | |
| parent | 58612382530af7d22160e73d4231e9c511f40b3c (diff) | |
| download | pbuilder-3b1e38a6d2d68debc8935e510b06f78cb018502f.tar pbuilder-3b1e38a6d2d68debc8935e510b06f78cb018502f.tar.gz | |
satisfydepends-gdebi: reorganize code to go in-line with other funcs.
The original implementation did not work well with cowdancer, change
it so that gdebi is called inside chroot and inside chroot only.
This has the drawback that gdebi must be available within chroot, but
it is much simpler than adding conditional cowdancer support to gdebi, and hopefully better for future development.
| -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 |