From 9c69143c185fd8516d8a27d8dcc404abb39ca531 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Mon, 14 Mar 2016 17:30:04 +0100
Subject: [PATCH] Feature #4217: Return error in the export action when needed

---
 src/datastore_mad/remotes/ceph/export | 4 ++++
 src/datastore_mad/remotes/fs/export   | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/datastore_mad/remotes/ceph/export b/src/datastore_mad/remotes/ceph/export
index 4db1d722b6..35455fbcd5 100755
--- a/src/datastore_mad/remotes/ceph/export
+++ b/src/datastore_mad/remotes/ceph/export
@@ -115,6 +115,10 @@ else
     CHECKSUM="$MD5"
 fi
 
+if [ -z "\$CHECKSUM" ]; then
+    exit 1
+fi
+
 cat <<EOT
 <MD5><![CDATA[\$CHECKSUM]]></MD5>
 <SIZE><![CDATA[$SIZE]]></SIZE>
diff --git a/src/datastore_mad/remotes/fs/export b/src/datastore_mad/remotes/fs/export
index 4c4e13f69e..2321d9d3a2 100755
--- a/src/datastore_mad/remotes/fs/export
+++ b/src/datastore_mad/remotes/fs/export
@@ -56,15 +56,17 @@ BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
 #-------------------------------------------------------------------------------
 
 INFO_SCRIPT=$(cat <<EOF
-
 CHECKSUM=\$(${MD5SUM} ${SRC} | cut -f1 -d' ')
 SIZE=\$(${DU} -Lm ${SRC} | cut -f1)
 FORMAT=\$(${QEMU_IMG} info ${SRC} 2>/dev/null | grep -Po '(?<=file format: )\w+')
 
+if [ -z "\$CHECKSUM" -o -z "\$SIZE" ]; then
+    exit 1
+fi
+
 echo "<MD5><![CDATA[\$CHECKSUM]]></MD5>"
 echo "<SIZE><![CDATA[\$SIZE]]></SIZE>"
-echo "<FORMAT><![CDATA[\${FORMAT-"unknown"}]]></FORMAT>"
-
+echo "<FORMAT><![CDATA[\${FORMAT:-unknown}]]></FORMAT>"
 EOF
 )