From 324fff9f7eb452c4c365f599b0f027a229add947 Mon Sep 17 00:00:00 2001
From: Axel Beckert <abe@deuxchevaux.org>
Date: Tue, 13 Nov 2012 19:47:36 +0100
Subject: [PATCH] Execute END block not on --version/--help/--manual (Closes:
 #684346)

---
 bin/xen-create-image | 10 ++++++----
 debian/changelog     |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/bin/xen-create-image b/bin/xen-create-image
index 22038d2..968cae6 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -1692,12 +1692,12 @@ sub checkOption
 
 =cut
 
+my $HELP    = 0;
+my $MANUAL  = 0;
+my $VERSION = 0;
+
 sub parseCommandLineArguments
 {
-    my $HELP    = 0;
-    my $MANUAL  = 0;
-    my $VERSION = 0;
-
     #
     #  We record the installation method here because we want
     # to ensure that we allow the method supplied upon the command line
@@ -4373,6 +4373,8 @@ sub unMountImage
 
 sub END
 {
+    exit 0 if $VERSION || $HELP || $MANUAL;
+
     my $host_rsa_key = '';
     #
     #  Unmount the image if it is still mounted.
diff --git a/debian/changelog b/debian/changelog
index 9b4a11b..91628f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xen-tools (4.3.1+dev-1) UNRELEASED; urgency=low
 
   * New upstream release
     - Fix symbolic link hooks/centos-6/15-setup-arch (Closes: #690299)
+    - Execute END block not on --version/--help/--manual (Closes: #684346)
 
  -- Axel Beckert <abe@debian.org>  Tue, 13 Nov 2012 18:05:05 +0100