bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Roman Kyrylych <Roman.Kyrylych@gmail.com>

Browse source 
* dependency removal fixes and refactoring
This commit is contained in:
Aaron Griffin 2007-01-17 04:54:55 +00:00
parent 803f92b6a6
commit 31e0561865
1 changed files with 24 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
scripts/makepkg
View file

@ -255,6 +255,27 @@ handledeps() {
return $missingdeps return $missingdeps
} }
# fix flyspray bug #5923
removedeps() {
if [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a \( ! -z "$deplist" -o ! -z "$makedeplist" \) ]; then
msg "Removing installed dependencies..."
pacman3 $PACMAN_OPTS -R $makedeplist $deplist
# fixes bug #6215
elif [ "$RMDEPS" = "1" -a "$DEP_SUDO" = "1" -a \( ! -z "$deplist" -o ! -z "$makedeplist" \) ]; then
msg "Removing installed dependencies..."
if [ "$INFAKEROOT" = "1" ]; then
export FAKEROOTKEY2=$FAKEROOTKEY
unset $FAKEROOTKEY
fi
sudo pacman3 $PACMAN_OPTS -R $makedeplist $deplist
if [ "$INFAKEROOT" = "1" ]; then
export FAKEROOTKEY=$FAKEROOTKEY2
unset $FAKEROOTKEY2
fi
fi
}
usage() { usage() {
echo "makepkg version $myver" echo "makepkg version $myver"
echo echo
@ -751,22 +772,7 @@ else
if [ ${PIPESTATUS[0]} -gt 0 ]; then if [ ${PIPESTATUS[0]} -gt 0 ]; then
error "Build Failed. Aborting..." error "Build Failed. Aborting..."
# fix flyspray bug #5923 removedeps
if [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a \( ! -z "$deplist" -o ! -z "$makedeplist" \) ]; then
msg "Removing installed dependencies..."
pacman $PACMAN_OPTS -R $makedeplist $deplist
elif [ "$RMDEPS" = "1" -a "$DEP_SUDO" = "1" ]; then
msg "Removing installed dependencies..."
if [ "$INFAKEROOT" = "1" ]; then
export FAKEROOTKEY2=$FAKEROOTKEY
unset $FAKEROOTKEY
fi
sudo pacman $PACMAN_OPTS -R $makedeplist $deplist
if [ "$INFAKEROOT" = "1" ]; then
export FAKEROOTKEY=$FAKEROOTKEY2
unset $FAKEROOTKEY2
fi
fi
exit 2 exit 2
fi fi
else else
@ -776,22 +782,7 @@ else
[ $set_e -eq 1 ] && set +e [ $set_e -eq 1 ] && set +e
if [ $? -gt 0 ]; then if [ $? -gt 0 ]; then
error "Build Failed. Aborting..." error "Build Failed. Aborting..."
# fix flyspray bug #5923 removedeps
if [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a \( ! -z "$deplist" -o ! -z "$makedeplist" \) ]; then
msg "Removing installed dependencies..."
pacman $PACMAN_OPTS -R $makedeplist $deplist
elif [ "$RMDEPS" = "1" -a "$DEP_SUDO" = "1" ]; then
msg "Removing installed dependencies..."
if [ "$INFAKEROOT" = "1" ]; then
export FAKEROOTKEY2=$FAKEROOTKEY
unset $FAKEROOTKEY
fi
sudo pacman $PACMAN_OPTS -R $makedeplist $deplist
if [ "$INFAKEROOT" = "1" ]; then
export FAKEROOTKEY=$FAKEROOTKEY2
unset $FAKEROOTKEY2
fi
fi
exit 2 exit 2
fi fi
fi fi
@ -932,21 +923,7 @@ if [ "$CLEANUP" = "1" ]; then
rm -rf ${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log* rm -rf ${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log*
fi fi
if [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a \( ! -z "$deplist" -o ! -z "$makedeplist" \) ]; then removedeps
msg "Removing installed dependencies..."
pacman $PACMAN_OPTS -R $makedeplist $deplist
elif [ "$RMDEPS" = "1" -a "$DEP_SUDO" = "1" ]; then
msg "Removing installed dependencies..."
if [ "$INFAKEROOT" = "1" ]; then
FAKEROOTKEY2=$FAKEROOTKEY
unset FAKEROOTKEY
fi
sudo pacman $PACMAN_OPTS -R $makedeplist $deplist
if [ "$INFAKEROOT" = "1" ]; then
export FAKEROOTKEY=$FAKEROOTKEY2
unset FAKEROOTKEY2
fi
fi
msg "Finished making: $pkgname ($(date))" msg "Finished making: $pkgname ($(date))"