[pbuilder] 01/03: strip leading path from the programs
Mattia Rizzolo
mattia at debian.org
Sun May 1 22:43:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository pbuilder.
commit 59c810f7638020b6c9703afd36161d4b71653d4d
Author: Mattia Rizzolo <mattia at debian.org>
Date: Sun May 1 21:29:12 2016 +0000
strip leading path from the programs
They are all in PATH, so let the shell finding them instead of calling them
directly with the full path.
Closes: #635698
---
debuild-pbuilder | 2 +-
pbuilder | 6 +++---
pbuilder-buildpackage | 6 +++---
pbuilder-buildpackage-funcs | 2 +-
pbuilder-createbuildenv | 8 ++++----
pbuilder-modules | 2 +-
pbuilder-satisfydepends-classic | 6 +++---
pbuilder-satisfydepends-experimental | 12 ++++++------
pbuilder-satisfydepends-funcs | 4 ++--
pbuilder-satisfydepends-gdebi | 8 ++++----
pbuilder-updatebuildenv | 12 ++++++------
pdebuild-internal | 2 +-
12 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/debuild-pbuilder b/debuild-pbuilder
index 1791e13..06326e3 100644
--- a/debuild-pbuilder
+++ b/debuild-pbuilder
@@ -12,4 +12,4 @@ fi;
. /usr/lib/pbuilder/pbuilder-loadconfig
$PBUILDERROOTCMD "$PBUILDERSATISFYDEPENDSCMD"
-/usr/bin/debuild "$@"
+debuild "$@"
diff --git a/pbuilder b/pbuilder
index 6a589e6..000e8c9 100755
--- a/pbuilder
+++ b/pbuilder
@@ -74,7 +74,7 @@ case "$1" in
fi
executehooks "F"
- (${CHROOTEXEC} bin/bash -c 'exec -a -bash bin/bash')
+ (${CHROOTEXEC} bash -c 'exec -a -bash bash')
RET=$?
save_aptcache
@@ -90,7 +90,7 @@ case "$1" in
log.i "Saving the results, modifications to this session will persist"
umountproc
trap cleanbuildplace_trap exit sighup
- ${CHROOTEXEC} /usr/bin/apt-get clean || true
+ ${CHROOTEXEC} apt-get clean || true
create_basetgz
cleanbuildplace
trap - exit sighup
@@ -140,7 +140,7 @@ case "$1" in
log.i "Saving the results, modifications to this session will persist"
umountproc
trap cleanbuildplace_trap exit sighup
- ${CHROOTEXEC} /usr/bin/apt-get clean || true
+ ${CHROOTEXEC} apt-get clean || true
create_basetgz
cleanbuildplace
trap - exit sighup
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 2833046..ffe3430 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -67,9 +67,9 @@ case $USENETWORK in
fi
;;
*)
- if /usr/bin/unshare -n -- /usr/lib/pbuilder/pbuilder-unshare-wrapper true; then
+ if unshare -n -- /usr/lib/pbuilder/pbuilder-unshare-wrapper true; then
USENETWORK=no
- UNSHARE="/usr/bin/unshare -n -- /usr/lib/pbuilder/pbuilder-unshare-wrapper"
+ UNSHARE="unshare -n -- /usr/lib/pbuilder/pbuilder-unshare-wrapper"
log.i "pbuilder: network access will be disabled during build"
else
USENETWORK=yes
@@ -142,7 +142,7 @@ else
log.e "pbuilder: Failed chowning to $BUILDUSERNAME:$BUILDUSERNAME"
exit 1;
fi
-if echo "( cd $BUILDDIR; env PATH=\"$PATH\" /usr/bin/dpkg-source -x $(basename "$PACKAGENAME") )" | $UNSHARE $CHROOTEXEC env $SUTOUSER ; then
+if echo "( cd $BUILDDIR; env PATH=\"$PATH\" dpkg-source -x $(basename "$PACKAGENAME") )" | $UNSHARE $CHROOTEXEC env $SUTOUSER ; then
: # success
else
log.e "pbuilder: Failed extracting the source"
diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs
index a1f3575..42a3e1b 100644
--- a/pbuilder-buildpackage-funcs
+++ b/pbuilder-buildpackage-funcs
@@ -66,7 +66,7 @@ function checkbuilddep () {
fi
# install extra packages to the chroot
if [ -n "$EXTRAPACKAGES" ]; then
- $CHROOTEXEC usr/bin/apt-get -q -y "${APTGETOPT[@]}" install ${EXTRAPACKAGES}
+ $CHROOTEXEC apt-get -q -y "${APTGETOPT[@]}" install ${EXTRAPACKAGES}
fi
}
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index 293e9d7..916144c 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -94,7 +94,7 @@ log.i "Refreshing the base.tgz "
log.i "upgrading packages"
mountproc
$TRAP umountproc_cleanbuildplace_trap exit sighup
-$CHROOTEXEC /usr/bin/apt-get -q "${APTGETOPT[@]}" update
+$CHROOTEXEC apt-get -q "${APTGETOPT[@]}" update
case "$(readlink -e "$PBUILDERSATISFYDEPENDSCMD")" in
*-aptitude)
@@ -113,8 +113,8 @@ fi
if [ -n "$REMOVEPACKAGES" ]; then remove_packages $REMOVEPACKAGES ; fi
recover_aptcache
-$CHROOTEXEC /usr/bin/apt-get -q -y "${APTGETOPT[@]}" "${FORCE_CONFNEW[@]}" dist-upgrade
-$CHROOTEXEC /usr/bin/apt-get -q -y "${APTGETOPT[@]}" install \
+$CHROOTEXEC apt-get -q -y "${APTGETOPT[@]}" "${FORCE_CONFNEW[@]}" dist-upgrade
+$CHROOTEXEC apt-get -q -y "${APTGETOPT[@]}" install \
build-essential \
dpkg-dev \
$EXTRAPACKAGES
@@ -122,7 +122,7 @@ save_aptcache
executehooks "E"
umountproc
-$CHROOTEXEC /usr/bin/apt-get clean || true
+$CHROOTEXEC apt-get clean || true
$TRAP cleanbuildplace_trap exit sighup
# Internal_build_uml is set when --no-targz is set, this code is actually never called from pbuilder-user-mode-linux
diff --git a/pbuilder-modules b/pbuilder-modules
index c06cfea..e91d550 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -711,7 +711,7 @@ function add_additional_aptkeyrings() {
# additional keys.
for KEY in "${APTKEYRINGS[@]}"; do
log.i "adding apt key file ${KEY}."
- $CHROOTEXEC /usr/bin/apt-key add - < "${KEY}" > /dev/null
+ $CHROOTEXEC apt-key add - < "${KEY}" > /dev/null
done
}
diff --git a/pbuilder-satisfydepends-classic b/pbuilder-satisfydepends-classic
index c001792..7d8d50b 100755
--- a/pbuilder-satisfydepends-classic
+++ b/pbuilder-satisfydepends-classic
@@ -55,7 +55,7 @@ get_dep_op_and_ver() {
# call apt-get in chroot in simulate mode
apt_sim() {
- $CHROOTEXEC /usr/bin/apt-get -s install "$@"
+ $CHROOTEXEC apt-get -s install "$@"
}
# Use this function to fulfill the dependency (almost)
@@ -173,8 +173,8 @@ checkbuilddep_internal() {
fi
# if package exists, remove it.
- if $CHROOTEXEC /usr/bin/dpkg -s "$CURRENTREALPKGNAME" 2>&1 | grep -q ^Package:; then
- if ! $CHROOTEXEC /usr/bin/apt-get -q -y remove "$CURRENTREALPKGNAME" ; then
+ if $CHROOTEXEC dpkg -s "$CURRENTREALPKGNAME" 2>&1 | grep -q ^Package:; then
+ if ! $CHROOTEXEC apt-get -q -y remove "$CURRENTREALPKGNAME" ; then
echo "E: Could not satisfy build-conflicts" >&2
exit 1
fi
diff --git a/pbuilder-satisfydepends-experimental b/pbuilder-satisfydepends-experimental
index 77a4e90..b31418a 100755
--- a/pbuilder-satisfydepends-experimental
+++ b/pbuilder-satisfydepends-experimental
@@ -60,7 +60,7 @@ function checkbuilddep_internal () {
while [ "$SATISFIED" = "no" ]; do
echo " -> Trying to add $CURRENT_APT_COMMAND"
- if APT_OUTPUT="$( exec 2>&1; LC_ALL=C $CHROOTEXEC /usr/bin/apt-get -s install $APTFLAG $INSTALLPKGLIST $CURRENT_APT_COMMAND )"; then
+ if APT_OUTPUT="$( exec 2>&1; LC_ALL=C $CHROOTEXEC apt-get -s install $APTFLAG $INSTALLPKGLIST $CURRENT_APT_COMMAND )"; then
# success, we're done
SATISFIED="yes"
INSTALLPKGLIST="$INSTALLPKGLIST $CURRENT_APT_COMMAND"
@@ -91,7 +91,7 @@ function checkbuilddep_internal () {
fi
echo " -> Cannot install $CURRENT_APT_COMMAND; apt errors follow:"
- if $CHROOTEXEC /usr/bin/apt-get -s install $APTFLAG $INSTALLPKGLIST "$CURRENT_APT_COMMAND"; then
+ if $CHROOTEXEC apt-get -s install $APTFLAG $INSTALLPKGLIST "$CURRENT_APT_COMMAND"; then
:
fi
# package could not be found. -- looking for alternative.
@@ -100,13 +100,13 @@ function checkbuilddep_internal () {
if [ -n "$PROVIDED" ]; then
# something provides this package
echo " -> Considering $PROVIDED to satisfy the dependency "
- if $CHROOTEXEC /usr/bin/apt-get -s install $APTFLAG $INSTALLPKGLIST $PROVIDED >& /dev/null; then
+ if $CHROOTEXEC apt-get -s install $APTFLAG $INSTALLPKGLIST $PROVIDED >& /dev/null; then
SATISFIED="yes";
INSTALLPKGLIST="$INSTALLPKGLIST $PROVIDED"
else
# show the error for diagnostic purposes
echo " -> Cannot install $PROVIDED; apt errors follow:"
- if $CHROOTEXEC /usr/bin/apt-get -s install $APTFLAG $INSTALLPKGLIST $PROVIDED; then
+ if $CHROOTEXEC apt-get -s install $APTFLAG $INSTALLPKGLIST $PROVIDED; then
:
fi
fi
@@ -161,8 +161,8 @@ function checkbuilddep_internal () {
fi
# if package exists, remove it.
- if $CHROOTEXEC /usr/bin/dpkg -s $(echo "$INSTALLPKG" | tr "/" " " | awk '{print $1}') 2>&1 | grep -q ^Package:; then
- if ! $CHROOTEXEC /usr/bin/apt-get -q -y remove $CURRENTREALPKGNAME ; then
+ if $CHROOTEXEC dpkg -s $(echo "$INSTALLPKG" | tr "/" " " | awk '{print $1}') 2>&1 | grep -q ^Package:; then
+ if ! $CHROOTEXEC apt-get -q -y remove $CURRENTREALPKGNAME ; then
echo "E: Could not satisfy build-conflicts" >&2
exit 1
fi
diff --git a/pbuilder-satisfydepends-funcs b/pbuilder-satisfydepends-funcs
index a6c2101..6b4414a 100755
--- a/pbuilder-satisfydepends-funcs
+++ b/pbuilder-satisfydepends-funcs
@@ -24,7 +24,7 @@
package_versions() {
local PACKAGE="$1"
- LC_ALL=C $CHROOTEXEC /usr/bin/apt-cache show "$PACKAGE" | sed -n 's/^Version: //p'
+ LC_ALL=C $CHROOTEXEC apt-cache show "$PACKAGE" | sed -n 's/^Version: //p'
}
candidate_version() {
@@ -301,7 +301,7 @@ checkbuilddep_restrictiondeps() {
checkbuilddep_provides() {
local PACKAGENAME="$1"
# PROVIDED needs to be used outside of this function.
- PROVIDED=$($CHROOTEXEC /usr/bin/apt-cache showpkg "$PACKAGENAME" \
+ PROVIDED=$($CHROOTEXEC apt-cache showpkg "$PACKAGENAME" \
| awk '{p=0}/^Reverse Provides:/,/^$/{p=1}{if(p && ($0 !~ "Reverse Provides:")){PACKAGE=$1}} END{print PACKAGE}')
}
diff --git a/pbuilder-satisfydepends-gdebi b/pbuilder-satisfydepends-gdebi
index 50b62b1..1e8bf50 100644
--- a/pbuilder-satisfydepends-gdebi
+++ b/pbuilder-satisfydepends-gdebi
@@ -23,20 +23,20 @@
set -e
function checkbuilddep_internal () {
- if ! [ -x /usr/bin/gdebi ]; then
+ if ! [ -x gdebi ]; then
echo "E: You need the gdebi-core package to resolve build-deps using gdebi" >&2
exit 1
fi
NO_RECOMMENDS=""
- if VERSION=$(/usr/bin/gdebi --version 2>/dev/null); then
+ if VERSION=$(gdebi --version 2>/dev/null); then
if dpkg --compare-versions "$VERSION" ge 0.3.9; then
NO_RECOMMENDS="-o APT::Install-Recommends=false"
fi
fi
- INSTALL=$(/usr/bin/gdebi --quiet --root "$CHROOT" --apt-line "$NO_RECOMMENDS" "$DEBIAN_CONTROL")
- $CHROOTEXEC /usr/bin/apt-get install -q -y "${APTGETOPT[@]}" $INSTALL
+ INSTALL=$(gdebi --quiet --root "$CHROOT" --apt-line "$NO_RECOMMENDS" "$DEBIAN_CONTROL")
+ $CHROOTEXEC apt-get install -q -y "${APTGETOPT[@]}" $INSTALL
}
. "${BASH_SOURCE%/*}/pbuilder-satisfydepends-checkparams"
diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv
index 093a405..fafe891 100755
--- a/pbuilder-updatebuildenv
+++ b/pbuilder-updatebuildenv
@@ -39,7 +39,7 @@ $TRAP umountproc_cleanbuildplace_trap exit sighup
log.i "Refreshing the base.tgz "
log.i "upgrading packages"
-$CHROOTEXEC /usr/bin/apt-get -q "${APTGETOPT[@]}" update
+$CHROOTEXEC apt-get -q "${APTGETOPT[@]}" update
# automatically add packages needed for optional features to the chroot
@@ -82,12 +82,12 @@ if [ "$DEBDELTA" = "yes" ]; then
fi
fi
-$CHROOTEXEC /usr/bin/apt-get -q -y "${APTGETOPT[@]}" "${FORCE_CONFNEW[@]}" dist-upgrade
+$CHROOTEXEC apt-get -q -y "${APTGETOPT[@]}" "${FORCE_CONFNEW[@]}" dist-upgrade
# autoremove: Ignore error in case of etch because apt in etch doesn't
# support autoremove. TODO: Do not ignore error when etch is no longer
# supported.
-$CHROOTEXEC /usr/bin/apt-get -q -y "${APTGETOPT[@]}" autoremove || true
-$CHROOTEXEC /usr/bin/apt-get -q -y "${APTGETOPT[@]}" install \
+$CHROOTEXEC apt-get -q -y "${APTGETOPT[@]}" autoremove || true
+$CHROOTEXEC apt-get -q -y "${APTGETOPT[@]}" install \
build-essential \
dpkg-dev \
$EXTRAPACKAGES
@@ -102,7 +102,7 @@ add_additional_aptkeyrings
# optionally auto-clean apt-cache
if [ "${AUTOCLEANAPTCACHE}" = "yes" -a -n "$APTCACHE" ]; then
log.i "Cleaning the cached apt archive"
- $CHROOTEXEC /usr/bin/apt-get autoclean || true
+ $CHROOTEXEC apt-get autoclean || true
find "$APTCACHE/" -maxdepth 1 -name \*.deb | \
while read A; do
if [ ! -f "$BUILDPLACE/var/cache/apt/archives/$(basename "$A")" -a \
@@ -117,7 +117,7 @@ $TRAP umountproc_cleanbuildplace_trap exit sighup
executehooks "E"
umountproc
-$CHROOTEXEC /usr/bin/apt-get clean || true
+$CHROOTEXEC apt-get clean || true
$TRAP cleanbuildplace_trap exit sighup
if [ ! "${INTERNAL_BUILD_UML}" = "yes" ]; then
diff --git a/pdebuild-internal b/pdebuild-internal
index 928f53c..b795867 100644
--- a/pdebuild-internal
+++ b/pdebuild-internal
@@ -126,7 +126,7 @@ executehooks "A"
# do build with that user.
# $DEBBUILDOPTS is evaluated inside the su and chroot.
export DEBBUILDOPTS
-CMD="env PATH=$PATH /usr/bin/dpkg-buildpackage -rfakeroot -us -uc "'${DEBBUILDOPTS}'
+CMD="env PATH=$PATH dpkg-buildpackage -rfakeroot -us -uc "'${DEBBUILDOPTS}'
echo "I: Running $CMD"
# This command should be ran with current directory as bind-mounted
# package source directory
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pbuilder/pbuilder.git
More information about the Pbuilder-maint
mailing list