summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2012-06-07 08:09:46 +0200
committerDan McGee <dan@archlinux.org>2012-06-26 06:08:08 +0200
commit81dd6ddf0cdd4034771828529c65d61e5bc94e5d (patch)
tree7e61ad4089cf5f4a1d7dd88627ccaa63dc49adbc
parentd310b6f85cd664a45a19d74678b0a4abeb3c5e25 (diff)
downloadpacman-81dd6ddf0cdd4034771828529c65d61e5bc94e5d.tar.gz
pacman-81dd6ddf0cdd4034771828529c65d61e5bc94e5d.tar.xz
makepkg: install deps with --repackage
I have noticed that quite a number of packages fail with "makepkg -R" when their (make)dependencies are not installed. Adjust makepkg to check for dependencies when used with -R. This can still be avoided by using --nodeps/-d. Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index c0556918..63cdd4dc 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2424,9 +2424,9 @@ if (( SOURCEONLY )); then
exit 0
fi
-if (( NODEPS || ( (NOBUILD || REPKG) && !DEP_BIN ) )); then
- # no warning message needed for nobuild, repkg
- if (( NODEPS || ( REPKG && PKGFUNC ) )); then
+if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then
+ # no warning message needed for nobuild
+ if (( NODEPS )); then
warning "$(gettext "Skipping dependency checks.")"
fi
elif type -p "${PACMAN%% *}" >/dev/null; then