[pacman-dev] [PATCH 3/4] makepkg: Clarified error message when a sourceball exist already

Allan McRae allan at archlinux.org
Mon Nov 9 19:42:41 EST 2009


Dan McGee wrote:
> On Fri, Nov 6, 2009 at 9:25 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 |    2 +-
>>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
>>> index 8fd5b27..8fc7c82 100644
>>> --- a/scripts/makepkg.sh.in
>>> +++ b/scripts/makepkg.sh.in
>>> @@ -1808,7 +1808,7 @@ msg "$(gettext "Making package: %s")" "$pkgbase
>>> $pkgver-$pkgrel ($(date))"
>>>  if [ "$SOURCEONLY" -ne 0 ]; then
>>>        if [ -f "$PKGDEST/${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" \
>>>             -a "$FORCE" -eq 0 ]; then
>>> -               error "$(gettext "A package has already been built. (use
>>> -f to overwrite)")"
>>> +               error "$(gettext "A source package has already been built.
>>> (use -f to overwrite)")"
>>>                exit 1
>>>        fi
>>>        create_srcpackage
>>
>> I'm happy with this.  I guess that was not done originally as it prevents
>> needing to translate two very similar strings.
>>
>> Dan/Xavier: opinions?
> 
> Fine with me, we already added a "duplicate" message in the last
> iteration [1] so another wouldn't really hurt.
> 

OK.  Pushed to my working branch.

Allan



More information about the pacman-dev mailing list