On 09/24/2017 08:52 PM, Luke Shumaker wrote:
> On Sun, 24 Sep 2017 20:08:51 -0400,
> Eli Schwartz wrote:
>> On 09/24/2017 06:56 PM, Luke Shumaker wrote:
>>> This mirrors dbscripts commit
>>> 625fa02 by Pierre Schmitz <pierre@archlinux.de> at 2017-04-18 14:20:49
>>> ---
>
>>> +. /usr/share/makepkg/util.sh
>>
>> Please just source the actual parts we need, the same way
>> https://git.archlinux.org/dbscripts.git/commit/?id=625fa02 also only uses
>> /usr/share/makepkg/util/message.sh
>> /usr/share/makepkg/util/util.sh
>> /usr/share/makepkg/util/pkgbuild.sh
>
> I was wondering if someone was going to call me on that. I suppose I
> should have noted in the commit message that 2 days later, in commit
> 76f95dd, Pierre changed it to use /usr/share/makepkg/util.sh instead;
> so I mimicked that. AFAICT, that change was unrelated to the rest of
> 76f95dd, but it's quite a large patch, and I didn't look at it too
> closely.
>
> https://git.archlinux.org/dbscripts.git/commit/?id=76f95dd
Hah! :p
Well, this seems like bloat anyway, maybe I should ask Pierre to change
it back...
It seems simpler to me, even if it loads more code than needed. If everyone sources util.sh instead of its components directly, makepkg can shuffle the internals around without breaking consumers. This is also a common pattern seen in C includes.
I'll apply this patch as-is now. We can still change it afterwards.
Luke, thanks for your continued work on devtools.