Xavier wrote:

On Wed, Oct 21, 2009 at 7:13 PM, Cedric Staniewski <cedric@gmx.ca> wrote:

...

Signed-off-by: Cedric Staniewski <cedric@gmx.ca> --- scripts/makepkg.sh.in | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 40367ae..f6b87c2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -336,7 +336,12 @@ download_file() { dlcmd="$dlcmd \"$url\"" fi

- eval $dlcmd || return $? + eval $dlcmd + local ret=$? + if [ $ret -gt 0 ]; then + rm -f -- "$dlfile" + return $ret + fi

# rename the temporary download file to the final destination if [ "$dlfile" != "$file" ]; then

The purpose of the .part file is to allow resume. So I don't think we want to remove it. What was your intention, why are .part files a problem ?

Actually never thought about that since I did not experience a disrupted download so far. Therefore, the only .part files I saw were empty ones, because the source did not existed anymore or the url was just wrong. Attached a new patch which should only remove the empty .part files. Thanks for the pointer.

From c2a5b433f810995de5d7520287d5ea0c8209ecfa Mon Sep 17 00:00:00 2001 -- 8< -- From: Cedric Staniewski <cedric@gmx.ca> Date: Wed, 21 Oct 2009 19:13:36 +0200 Subject: [PATCH] makepkg: remove empty .part files after a failed download

Signed-off-by: Cedric Staniewski <cedric@gmx.ca> --- scripts/makepkg.sh.in | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 40367ae..3f1a054 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -336,7 +336,12 @@ download_file() { dlcmd="$dlcmd \"$url\"" fi - eval $dlcmd || return $? + eval $dlcmd + local ret=$? + if [ $ret -gt 0 ]; then + [ ! -s "$dlfile" ] && rm -f -- "$dlfile" + return $ret + fi # rename the temporary download file to the final destination if [ "$dlfile" != "$file" ]; then -- 1.6.5.1

Cedric Staniewski wrote:

Xavier wrote:

...

On Wed, Oct 21, 2009 at 10:01 PM, Cedric Staniewski <cedric@gmx.ca> wrote:

...

Ray Rashif wrote:

...

2009/10/22 Xavier <shiningxc@gmail.com>

...

On Wed, Oct 21, 2009 at 7:38 PM, Cedric Staniewski <cedric@gmx.ca> wrote:

...

- eval $dlcmd || return $? + eval $dlcmd + local ret=$? + if [ $ret -gt 0 ]; then + [ ! -s "$dlfile" ] && rm -f -- "$dlfile" + return $ret + fi

I don't understand, I cannot get it to work. It looks like when "eval $dlcmd" fails, nothing else is run in that function.

I added a echo statement, but I still only see that message at the end : ==> ERROR: An unknown error has occurred. Exiting...

looks like there is no return to handle (fail but no reason given), so makepkg traps that. That's odd. I patched makepkg from pacman 3.3.2 to test the patch, so I did not notice this. But this bug (or is it intended?) already exists in master. You can remove the "|| return $?" part from the eval line, add echos and it fails just before the second echo.

The issue reminded me of the following patch : http://projects.archlinux.org/?p=pacman.git;a=commitdiff;h=545eac145d77c6671...

But it seems errexit is only enabled for build and package functions, so this should not affect sources download.

Already found the responsible change. It's 'set -E' from the patch you mentioned.

There are three possible solutions I see: - remove set -E - add some code to dlcmd to handle the error code in the subshell - try to get rid of eval so that the code is not executed in a subshell anymore

eval is needed, so I added some code to dlcmd. This patch finally works, even with latest git. ;) Thanks Xavier and Ray; I should really take a look in the Makefiles to find a way to only "build" makepkg.

From e809e3182f94fd4144cdb816d0af90587bf04ea2 Mon Sep 17 00:00:00 2001 From: Cedric Staniewski <cedric@gmx.ca> Date: Wed, 21 Oct 2009 19:13:36 +0200 -- 8< -- Subject: [PATCH] makepkg: remove empty .part files after a failed download

Signed-off-by: Cedric Staniewski <cedric@gmx.ca> --- scripts/makepkg.sh.in | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 40367ae..78b6904 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -336,7 +336,12 @@ download_file() { dlcmd="$dlcmd \"$url\"" fi - eval $dlcmd || return $? + local ret=0 + eval "$dlcmd || ret=\$?" + if [ $ret -gt 0 ]; then + [ ! -s "$dlfile" ] && rm -f -- "$dlfile" + return $ret + fi # rename the temporary download file to the final destination if [ "$dlfile" != "$file" ]; then -- 1.6.5.1

On Wed, Oct 21, 2009 at 11:41 PM, Henning Garus <henning.garus@googlemail.com> wrote:

...

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 40367ae..78b6904 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -336,7 +336,12 @@ download_file() {               dlcmd="$dlcmd \"$url\""       fi

-     eval $dlcmd || return $? +     local ret=0 +     eval "$dlcmd || ret=\$?"

eval $dlcmd || ret=$? seems to work as well.

Hmm, I am pretty sure I tried that and it did not work either.

On Wed, Oct 21, 2009 at 10:40 PM, Cedric Staniewski <cedric@gmx.ca> wrote:

...

From e809e3182f94fd4144cdb816d0af90587bf04ea2 Mon Sep 17 00:00:00 2001 From: Cedric Staniewski <cedric@gmx.ca> Date: Wed, 21 Oct 2009 19:13:36 +0200 -- 8< -- Subject: [PATCH] makepkg: remove empty .part files after a failed download

Signed-off-by: Cedric Staniewski <cedric@gmx.ca> ---  scripts/makepkg.sh.in |    7 ++++++-  1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 40367ae..78b6904 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -336,7 +336,12 @@ download_file() {                dlcmd="$dlcmd \"$url\""        fi

-       eval $dlcmd || return $? +       local ret=0 +       eval "$dlcmd || ret=\$?" +       if [ $ret -gt 0 ]; then +               [ ! -s "$dlfile" ] && rm -f -- "$dlfile" +               return $ret +       fi

       # rename the temporary download file to the final destination        if [ "$dlfile" != "$file" ]; then -- 1.6.5.1

This one works for me now, applied to my working branch.

On Wed, Oct 21, 2009 at 6:59 PM, Allan McRae <allan@archlinux.org> wrote:

Xavier wrote:

...

On Wed, Oct 21, 2009 at 10:40 PM, Cedric Staniewski <cedric@gmx.ca> wrote:

...

...

From e809e3182f94fd4144cdb816d0af90587bf04ea2 Mon Sep 17 00:00:00 2001 From: Cedric Staniewski <cedric@gmx.ca> Date: Wed, 21 Oct 2009 19:13:36 +0200 -- 8< -- Subject: [PATCH] makepkg: remove empty .part files after a failed download

Signed-off-by: Cedric Staniewski <cedric@gmx.ca> ---  scripts/makepkg.sh.in |    7 ++++++-  1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 40367ae..78b6904 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -336,7 +336,12 @@ download_file() {               dlcmd="$dlcmd \"$url\""       fi

-       eval $dlcmd || return $? +       local ret=0 +       eval "$dlcmd || ret=\$?" +       if [ $ret -gt 0 ]; then +               [ ! -s "$dlfile" ] && rm -f -- "$dlfile" +               return $ret +       fi

      # rename the temporary download file to the final destination       if [ "$dlfile" != "$file" ]; then -- 1.6.5.1

This one works for me now, applied to my working branch.

This looks a really nice feature.  I end up having a lot of empty .part files in my build tree.

I had no idea this was happening, so thanks for finding it: $ ll /home/makepkg/sources/*.part -rw-r--r-- 1 dmcgee wheel 0 2009-08-17 19:18 /home/makepkg/sources/libfetch-2.24.tar.gz.part -rw-r--r-- 1 dmcgee wheel 0 2009-04-12 21:05 /home/makepkg/sources/libstdc++-man-20080118.tar.bz2.part -rw-r--r-- 1 dmcgee wheel 0 2009-09-22 21:49 /home/makepkg/sources/pacman-3.3.1.tar.gz.part -rw-r--r-- 1 dmcgee wheel 0 2009-10-07 18:46 /home/makepkg/sources/pacman-3.3.2.tar.gz.part -rw-r--r-- 1 dmcgee wheel 1.8M 2009-01-29 23:21 /home/makepkg/sources/vpnclient-linux-x86_64-4.8.01.0640-k9.tar.gz.part -rw-r--r-- 1 dmcgee wheel 0 2009-08-16 16:27 /home/makepkg/sources/wine-1.1.27-1-i686.pkg.tar.gz.part