[pacman-dev] Patch for FS#31557

Jason St. John jstjohn at purdue.edu
Wed Jul 10 21:16:59 EDT 2013


On Thu, Jul 11, 2013 at 2:31 AM, Allan McRae <allan at archlinux.org> wrote:
> On 11/07/13 09:26, Allan McRae wrote:
>> On 11/07/13 06:46, Ashley Whetter wrote:
>>> Hey everyone,
>>>
>>> I've made a fix for issue FS#31557 (Merge installing makedepends and
>>> checkdepends).
>>> I've attached the patch and pasted it below:
>>>
>>> >From 447ba301bd9d24d3b60dd02d6382f64965ad7878 Mon Sep 17 00:00:00 2001
>>> From: Ashley Whetter <awhetter.2011 at my.bristol.ac.uk>
>>> Date: Wed, 10 Jul 2013 22:44:55 +0100
>>> Subject: [PATCH] makedeps and checkdeps are now installed together
>>>
>>> Fixes FS#31557
>>>
>>> Signed-off-by: Ashley Whetter <awhetter.2011 at my.bristol.ac.uk>
>>> ---
>>>  scripts/makepkg.sh.in | 5 +++--
>>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
>>> index 2a39157..4de0d34 100644
>>> --- a/scripts/makepkg.sh.in
>>> +++ b/scripts/makepkg.sh.in
>>> @@ -2952,11 +2952,12 @@ else
>>>   fi
>>>
>>>   msg "$(gettext "Checking buildtime dependencies...")"
>>> - resolve_deps ${makedepends[@]} || deperr=1
>>> + build_depends=("${makedepends[@]}")
>>>
>>>   if (( CHECKFUNC )); then
>>> - resolve_deps ${checkdepends[@]} || deperr=1
>>> + build_depends+=("${checkdepends[@]}")
>>>   fi
>>> + resolve_deps ${build_depends[@]} || deperr=1
>>
>> Why merge these at all?  This should work:
>>
>> resolve_deps ${makedepends[@]} ${checkdepends[@]} || deperr=1
>
> @Dave:  should those calls to resolve_deps be quoted?  Given a pkgname
> can theoretically have whitespace.
>
> Allan
>

Is it intended that pkgname can theoretically contain whitespace? I
can't think of any good reason for a pkgname to contain whitespace,
and it would probably simplify things to just forbid it in pkgname.

Jason


More information about the pacman-dev mailing list