cleanup a bit better from quilt fetch failures

diff --git a/fetch_trees b/fetch_trees
index bc5ac7fad90ea3e36edb84af706c594bb844caca..c5bdf73178d76d57b0b8436910e6e8a30b141fea 100755 (executable)
--- 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