From 322faf3cc00aa3f366ea9b8fa114404351b55deb Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 27 Oct 2010 13:27:40 +0200
Subject: [PATCH] Error recovery

---
 pkg/fedora/make-dist.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkg/fedora/make-dist.sh b/pkg/fedora/make-dist.sh
index ecfffb781..c96a7f756 100755
--- a/pkg/fedora/make-dist.sh
+++ b/pkg/fedora/make-dist.sh
@@ -252,8 +252,8 @@ function make_bundle()
             rm -rf $bundle_name
             cd diaspora
                 rm Gemfile.lock
+                rm -rf .bundle
                 if [ "$BUNDLE_FIX" = 'yes' ]; then
-                    rm -rf .bundle
                     bundle update
                 fi
 
@@ -262,10 +262,12 @@ function make_bundle()
                 git checkout Gemfile
                 build_git_gems  Gemfile vendor/git
                 sed -i  's|git://.*/|vendor/git/|g' Gemfile
-                rm -rf .bundle
                 # see: http://bugs.joindiaspora.com/issues/440
-                bundle install --path=vendor/bundle  ||
-                     bundle install --path=vendor/bundle
+                bundle install --path=vendor/bundle  || {
+                    rm -rf vendor/git/* .bundle
+                    build_git_gems  Gemfile vendor/git
+                    bundle install --path=vendor/bundle
+                }
                 bundle package
 
                 mkdir  -p "../$bundle_name/docs"