[pacman-dev] [PATCH 2/2] makepkg: Fixed logging for split packages

[Eric Bélanger]

On Tue, Nov 3, 2009 at 9:08 AM, Allan McRae <allan at archlinux.org> wrote:
> Eric Bélanger wrote:
>>
>> Signed-off-by: Eric Bélanger <snowmaniscool at gmail.com>
>> ---
>>  scripts/makepkg.sh.in |    6 ++++--
>>  1 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
>> index e2b28c1..180e128 100644
>> --- a/scripts/makepkg.sh.in
>> +++ b/scripts/makepkg.sh.in
>> @@ -142,7 +142,7 @@ clean_up() {
>>                                rm -f
>> "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package.log"*
>>                        elif [ "$SPLITPKG" -eq 1 ]; then
>>                                for pkg in ${pkgname[@]}; do
>> -                                       rm -f
>> "${pkg}-${pkgver}-${pkgrel}-${CARCH}-package.log"*
>> +                                       rm -f
>> "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package_${pkg}.log"*
>>
>
> This looks good and makes the logging more consistent in terms of log file
> naming.
>
>>                                done
>>                        fi
>>                fi
>> @@ -707,6 +707,8 @@ run_function() {
>>        msg "$(gettext "Starting %s()...")" "$pkgfunc"
>>        cd "$srcdir"
>>  +       local _pkgbase=$pkgbase
>>
>
> Why are you doing this?  Can you not just use $pkgbase directly below?
>

For some reasons, pkgbase wasn't defined anymore after the:
local shellopts=$(shopt -p)
line. But now it works. I've attached a new patch.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-makepkg-Fixed-logging-for-split-packages.patch
Type: text/x-patch
Size: 1267 bytes
Desc: not available
URL: <http://mailman.archlinux.org/pipermail/pacman-dev/attachments/20091103/dd85297e/attachment.bin>