Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D21C61728A for ; Wed, 28 Jan 2015 12:57:39 +0000 (UTC) Received: (qmail 25918 invoked by uid 500); 28 Jan 2015 12:57:39 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 25886 invoked by uid 500); 28 Jan 2015 12:57:39 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 25877 invoked by uid 99); 28 Jan 2015 12:57:39 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Jan 2015 12:57:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C0CC1E03EE; Wed, 28 Jan 2015 12:57:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Message-Id: <206f7c042bf84a17822fdf2b47be987a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 6b6ce5d Date: Wed, 28 Jan 2015 12:57:39 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master c2330f48d -> 6b6ce5d07 appliance: don't fail is bak is not found Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6b6ce5d0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6b6ce5d0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6b6ce5d0 Branch: refs/heads/master Commit: 6b6ce5d074d97ae89bf8d438733cc77729742216 Parents: c2330f4 Author: Rohit Yadav Authored: Wed Jan 28 18:27:19 2015 +0530 Committer: Rohit Yadav Committed: Wed Jan 28 18:27:19 2015 +0530 ---------------------------------------------------------------------- tools/appliance/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6b6ce5d0/tools/appliance/build.sh ---------------------------------------------------------------------- diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh index 24c90b6..d298090 100755 --- a/tools/appliance/build.sh +++ b/tools/appliance/build.sh @@ -397,7 +397,7 @@ function xen_server_export() { vboxmanage internalcommands converttoraw -format vdi "${hdd_path}" img.raw vhd-util convert -s 0 -t 1 -i img.raw -o stagefixed.vhd faketime '2010-01-01' vhd-util convert -s 1 -t 2 -i stagefixed.vhd -o "${appliance_build_name}-xen.vhd" - rm *.bak + rm -f *.bak bzip2 "${appliance_build_name}-xen.vhd" mv "${appliance_build_name}-xen.vhd.bz2" dist/ log INFO "${appliance} exported for XenServer: dist/${appliance_build_name}-xen.vhd.bz2"