[tor-commits] [tor-browser-bundle/master] Bug 18127: fix base-vm file name when using KVM

[gk at torproject.org]

commit 162a3984a3e1c069c366676cc7fdd0d4bc8a0586
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Tue Mar 29 17:27:41 2016 +0200

    Bug 18127: fix base-vm file name when using KVM
    
    The base-vm file name is different if we are using LXC or KVM.
---
 gitian/make-vms.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh
index 554cc27..089865b 100755
--- a/gitian/make-vms.sh
+++ b/gitian/make-vms.sh
@@ -25,7 +25,8 @@ build_and_test_vm() {
   local arch="$1"; shift
   local bits="$1"; shift
 
-  if [ ! -f ./base-$dist-$arch ];
+  if [ "z$USE_LXC" = "z1" -a ! -f ./base-$dist-$arch ] \
+      || [ "z$USE_LXC" != "z1" -a ! -f ./base-$dist-$arch.qcow2 ];
   then
     if [ "z$USE_LXC" = "z1" ];
     then