From: John Ferlan <jferlan@redhat.com>
Date: Fri, 13 Jan 2017 12:33:02 +0000 (-0500)
Subject: storage: Alter error message in probe/empty checks
X-Git-Tag: v3.0.0-rc2^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40ec4ff65859b245da3b116320e1be741d8eb131;p=thirdparty%2Flibvirt.git

storage: Alter error message in probe/empty checks

For case VIR_STORAGE_BLKID_PROBE_DIFFERENT, clean up the message to
avoid using the virsh like --overwrite syntax. Additionally provide
a different error message when not writing the label to avoid confusion.
---

diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 79482e6221..dc8f20c119 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -2808,10 +2808,17 @@ virStorageBackendBLKIDFindEmpty(const char *device,
         break;
 
     case VIR_STORAGE_BLKID_PROBE_DIFFERENT:
-        virReportError(VIR_ERR_STORAGE_POOL_BUILT,
-                       _("Device '%s' formatted cannot overwrite using '%s', "
-                         "requires build --overwrite"),
-                       device, format);
+        if (writelabel)
+            virReportError(VIR_ERR_STORAGE_POOL_BUILT,
+                           _("Format of device '%s' does not match the "
+                             "expected format '%s', forced overwrite is "
+                             "necessary"),
+                           device, format);
+        else
+            virReportError(VIR_ERR_OPERATION_INVALID,
+                           _("Format of device '%s' does not match the "
+                             "expected format '%s'"),
+                           device, format);
         break;
     }