emerge-delta-webrsync: rm empty file, bug #476416

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 0a943030d74b36b90cdd763daad467a890e64174..cd8653788878d38e072af67d87141933b0f7d912 100755 (executable)
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
 # Rewritten from the old, Perl-based emerge-webrsync script
@@ -134,8 +134,13 @@ fetch_file() {
 
        __vecho "Fetching file ${FILE} ..."
        # already set DISTDIR=
-       eval "${FETCHCOMMAND}" ${opts}
-       [ -s "${DISTDIR}/${FILE}" ]
+       eval "${FETCHCOMMAND} ${opts}"
+       if [[ $? -eq 0 && -s ${DISTDIR}/${FILE} ]] ; then
+               return 0
+       else
+               rm -f "${DISTDIR}/${FILE}"
+               return 1
+       fi
 }
 
 check_file_digest() {

diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync
index 01d7f4a65344ea902699644512fb7b2f11b8ce4b..f7f82f81716278b2dcee38437dabf363526910b0 100755 (executable)
--- a/misc/emerge-delta-webrsync
+++ b/misc/emerge-delta-webrsync
@@ -228,7 +228,12 @@ fetch_file() {
        __vecho "Fetching file ${FILE} ..."
        # already set DISTDIR=
        eval "${FETCHCOMMAND} ${opts}"
-       [ -s "${DISTDIR}/${FILE}" ]
+       if [[ $? -eq 0 && -s ${DISTDIR}/${FILE} ]] ; then
+               return 0
+       else
+               rm -f "${DISTDIR}/${FILE}"
+               return 1
+       fi
 }
 
 check_file_digest() {