[pacman-dev] [PATCH] makedeps and checkdeps are now installed together
From: Ashley Whetter <awhetter.2011@my.bristol.ac.uk> Thanks for the feedback on my last patch. I've updated the patch and included the recommended changes here. I dedcided to quote the arrays because it doesn't really cost anything to do it anyway. Regards, Ashley P.S. Hopefully I've used git send-email properly here! I tried to reply to the original thread but I don't think I can do it because I didn't use send-email the first time. Ashley Whetter (1): makedeps and checkdeps are now installed together scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 1.8.3.2
From: Ashley Whetter <awhetter.2011@my.bristol.ac.uk> Fixes FS#31557 Signed-off-by: Ashley Whetter <awhetter.2011@my.bristol.ac.uk> --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2a39157..06f7c25 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2952,10 +2952,10 @@ else fi msg "$(gettext "Checking buildtime dependencies...")" - resolve_deps ${makedepends[@]} || deperr=1 - if (( CHECKFUNC )); then - resolve_deps ${checkdepends[@]} || deperr=1 + resolve_deps "${makedepends[@]}" "${checkdepends[@]}" || deperr=1 + else + resolve_deps "${makedepends[@]}" || deperr=1 fi if (( RMDEPS )); then -- 1.8.3.2
On 12/07/13 20:06, awhetter.2011@my.bristol.ac.uk wrote:
From: Ashley Whetter <awhetter.2011@my.bristol.ac.uk>
Fixes FS#31557
Fine. I changed the subject to: "Install makedepends and checkdepends together"
Signed-off-by: Ashley Whetter <awhetter.2011@my.bristol.ac.uk> --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2a39157..06f7c25 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2952,10 +2952,10 @@ else fi
msg "$(gettext "Checking buildtime dependencies...")" - resolve_deps ${makedepends[@]} || deperr=1 - if (( CHECKFUNC )); then - resolve_deps ${checkdepends[@]} || deperr=1 + resolve_deps "${makedepends[@]}" "${checkdepends[@]}" || deperr=1 + else + resolve_deps "${makedepends[@]}" || deperr=1 fi
if (( RMDEPS )); then
participants (2)
-
Allan McRae
-
awhetter.2011＠my.bristol.ac.uk