Recommend pbuilder | aptitude for get-build-deps, and exit with an error

if neither are installed (LP: #799368)
This commit is contained in:
Stefano Rivera 2011-09-05 02:31:06 +02:00
parent 0d4c692262
commit b68895d129
3 changed files with 13 additions and 9 deletions

2
debian/changelog vendored
View File

@ -21,6 +21,8 @@ ubuntu-dev-tools (0.129) UNRELEASED; urgency=low
native syncs. (Bugs are closed one individually, via the API, post-sync) native syncs. (Bugs are closed one individually, via the API, post-sync)
* dgetlp, submittodebian, 404main: Use unicode strings for literal strings * dgetlp, submittodebian, 404main: Use unicode strings for literal strings
containing non-ASCII characters (LP: #836661) containing non-ASCII characters (LP: #836661)
* Recommend pbuilder | aptitude for get-build-deps, and exit with an error
if neither are installed (LP: #799368)
-- Stefano Rivera <stefanor@debian.org> Sat, 03 Sep 2011 21:04:38 +0200 -- Stefano Rivera <stefanor@debian.org> Sat, 03 Sep 2011 21:04:38 +0200

1
debian/control vendored
View File

@ -51,6 +51,7 @@ Recommends: bzr,
debootstrap, debootstrap,
genisoimage, genisoimage,
libwww-perl, libwww-perl,
pbulider | aptitude,
pbuilder | cowdancer | sbuild, pbuilder | cowdancer | sbuild,
perl-modules, perl-modules,
python-dns, python-dns,

View File

@ -32,8 +32,7 @@
# argument is the name of a package, and install the dependencies for # argument is the name of a package, and install the dependencies for
# all of them. # all of them.
if [ $# -eq 0 ] if [ $# -eq 0 ]; then
then
######################################################### #########################################################
# Install the dependencies for the source package the # Install the dependencies for the source package the
# user is working on. # user is working on.
@ -57,24 +56,26 @@ to use this script."
exit 0 exit 0
fi fi
if [ ! -x /usr/lib/pbuilder/pbuilder-satisfydepends -a -z "$(which aptitude)" ]; then
echo "Please install either «pbuilder» or «aptitude» in order to use this utility"
exit 1
fi
echo "Installing the build dependencies described in «$filepath»..." echo "Installing the build dependencies described in «$filepath»..."
if [ -x /usr/lib/pbuilder/pbuilder-satisfydepends ] if [ -x /usr/lib/pbuilder/pbuilder-satisfydepends ]; then
then
sudo /usr/lib/pbuilder/pbuilder-satisfydepends sudo /usr/lib/pbuilder/pbuilder-satisfydepends
else else
echo "Warning: «pbuilder» isn\'t installed, falling back to «dpkg-checkbuilddeps»." echo "Warning: «pbuilder» isn't installed, falling back to «dpkg-checkbuilddeps»."
sudo aptitude install $(echo $missing_dependencies | awk -F': ' '{ print $3 }' | sed 's/([^)]*)//g' | sed 's/|\s[^\s]*//g') sudo aptitude install $(echo $missing_dependencies | awk -F': ' '{ print $3 }' | sed 's/([^)]*)//g' | sed 's/|\s[^\s]*//g')
#' <--- Fix to avoid Geanys markup breaking #' <--- Fix to avoid Geanys markup breaking
fi fi
exit 0 exit 0
elif [ $# -eq 1 ] elif [ $# -eq 1 ]; then
then
######################################################### #########################################################
# Check if the given argument is a file name, else # Check if the given argument is a file name, else
# continue after the if. # continue after the if.
if [ -f $1 ] if [ -f $1 ]; then
then
packages='' packages=''
echo "Installing the build dependencies for the following packages:" echo "Installing the build dependencies for the following packages:"
while read line while read line