From 115b2cf8e7b41322ebe1431a15d0944c106c2d2f Mon Sep 17 00:00:00 2001
From: Leo Simons <lsimons@schubergphilis.com>
Date: Thu, 31 Jul 2014 15:23:18 +0200
Subject: [PATCH] CLOUDSTACK-7143: only archive the zipped hyperv image

Cherry-pick of d09acc44f2b36cd593ebe97ab1673b7757ea2c25.
---
 tools/appliance/build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index e3197e88db8..db21dade21d 100755
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -497,7 +497,8 @@ function hyperv_export() {
   # HyperV doesn't support import a zipped image from S3,
   # but we create a zipped version to save space on the jenkins box
   zip "${appliance_build_name}-hyperv.vhd.zip" "${appliance_build_name}-hyperv.vhd"
-  mv "${appliance_build_name}-hyperv.vhd.zip" "${appliance_build_name}-hyperv.vhd" dist/
+  add_on_exit rm "${appliance_build_name}-hyperv.vhd"
+  mv "${appliance_build_name}-hyperv.vhd.zip" dist/
   log INFO "${appliance} exported for HyperV: dist/${appliance_build_name}-hyperv.vhd.zip"
 }