0001-Split-up-base-vm-checks.patch

From 15c48f0995475332a98fb638fadd22a867e434a4 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra@gmail.com>
Date: Sun, 16 Jun 2013 19:46:16 -0700
Subject: [PATCH] Split up base vm checks.

---
 gitian/mkbundle-linux.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh
index c24e588..dbbcb6d 100755
--- a/gitian/mkbundle-linux.sh
+++ b/gitian/mkbundle-linux.sh
@@ -19,7 +19,7 @@ cd $GITIAN_DIR
 export PATH=$PATH:$PWD/libexec
 
 # TODO: Make a super-fresh option that kills the base vms
-if [ ! -f ./base-lucid-amd64.qcow2 -a ! -f ./base-lucid-amd64.qcow2 ];
+if [ ! -f ./base-lucid-i386.qcow2 ];
 then
   if [ "z$USE_LXC" = "z1" ];
   then
@@ -35,7 +35,10 @@ then
       exit 1
   fi
   stop-target
+fi
 
+if [ ! -f ./base-lucid-amd64.qcow2 ];
+then
   if [ "z$USE_LXC" = "z1" ];
   then
     ./bin/make-base-vm --lxc --arch amd64
@@ -45,7 +48,7 @@ then
   fi
   if [ $? -ne 0 ];
   then
-      echo "i386 VM creation failed"
+      echo "amd64 VM creation failed"
       exit 1
   fi
   stop-target
-- 
1.8.3.1