diff options
| author | Judd Vinet <judd@archlinux.org> | 2004-12-19 04:37:00 +0100 |
|---|---|---|
| committer | Judd Vinet <judd@archlinux.org> | 2004-12-19 04:37:00 +0100 |
| commit | f6b8ed22f40d422e2876be92b215187b5ff7b6e7 (patch) | |
| tree | ca771d1517967f5e97d4adf238f3825f7ececcad /scripts/makepkg | |
| parent | 4795965caf371a55285678e5860ae66e926ebd95 (diff) | |
| download | pacman-f6b8ed22f40d422e2876be92b215187b5ff7b6e7.tar.gz pacman-f6b8ed22f40d422e2876be92b215187b5ff7b6e7.tar.xz | |
Imported from pacman-2.9.3.tar.gz
Diffstat (limited to 'scripts/makepkg')
| -rwxr-xr-x | scripts/makepkg | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/makepkg b/scripts/makepkg index efc750d2..a4c4d23a 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -463,6 +463,7 @@ if [ "$GENMD5" = "0" ]; then # extract sources msg "Extracting Sources..." for netfile in ${source[@]}; do + unziphack=0 file=`strip_url $netfile` unset cmd case $file in @@ -473,6 +474,7 @@ if [ "$GENMD5" = "0" ]; then *.tar) cmd="tar -xf $file" ;; *.zip) + unziphack=1 cmd="unzip -qqo $file" ;; *.gz) cmd="gunzip $file" ;; @@ -483,9 +485,12 @@ if [ "$GENMD5" = "0" ]; then msg " $cmd" $cmd if [ $? -ne 0 ]; then - error "Failed to extract $file" - msg "Aborting..." - exit 1 + # unzip will return a 1 as a warning, it is not an error + if [ "$unziphack" != "1" -o $? -ne 1 ]; then + error "Failed to extract $file" + msg "Aborting..." + exit 1 + fi fi fi done |