From 02858fad14c73c11edeb6e078d73f12e9f2da071 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 20 Jan 2009 11:15:59 +1100 Subject: [PATCH] cleanup a bit better from quilt fetch failures --- fetch_trees | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/fetch_trees b/fetch_trees index bc5ac7f..c5bdf73 100755 --- a/fetch_trees +++ b/fetch_trees @@ -45,12 +45,18 @@ while read email type name url ref; do if $use_rsync; then rsync -avz "$rurl/series" series || { echo "rsync of $name series file failed" 1>&2 + cd .. + rm -rf "$name" + git checkout "$name" cd "$origwd" continue } else wget -N -nv --no-cache "$url/series" || { echo "Wget of $name series file failed" 1>&2 + cd .. + rm -rf "$name" + git checkout "$name" cd "$origwd" continue } @@ -73,7 +79,8 @@ while read email type name url ref; do cd .. rm -rf "$name" git checkout "$name" - break + cd "$origwd" + continue } else wget -N -nv --no-cache -B "$url" -i .series.next || { @@ -81,7 +88,8 @@ while read email type name url ref; do cd .. rm -rf "$name" git checkout "$name" - break + cd "$origwd" + continue } fi comm -23 .series.old .series.next | xargs -r rm -f -- 2.39.2