[Pkg-libvirt-commits] [libguestfs] 161/266: v2v: -o rhev: Improve the error message when you pass a bogus -os parameter.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag debian/1%1.27.35-1
in repository libguestfs.

commit 02b653496db36666c8f36e4a1ec6a0daad3de146
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Aug 21 22:36:44 2014 +0100

    v2v: -o rhev: Improve the error message when you pass a bogus -os parameter.
---
 v2v/output_RHEV.ml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/v2v/output_RHEV.ml b/v2v/output_RHEV.ml
index fec9a74..5c90d36 100644
--- a/v2v/output_RHEV.ml
+++ b/v2v/output_RHEV.ml
@@ -170,8 +170,11 @@ object
       (* Check that the domain has been attached to a Data Center by
        * checking that the master/vms directory exists.
        *)
-      if not (is_directory (mp // uuid // "master" // "vms")) then
-        error (f_"the Export Storage Domain (%s) has not been attached to any Data Center.\n\nYou have to do this through the RHEV-M / OVirt user interface first.") os;
+      let () =
+        let master_vms_dir = mp // uuid // "master" // "vms" in
+        if not (is_directory master_vms_dir) then
+          error (f_"%s does not exist or is not a directory.\n\nMost likely cause: Either the Export Storage Domain (%s) has not been attached to any Data Center, or the path %s is not an Export Storage Domain at all.\n\nYou have to attach the Export Storage Domain to a Data Center using the RHEV-M / OVirt user interface first.\n\nIf you don't know what the Export Storage Domain mount point should be then you can also find this out through the RHEV-M user interface.")
+            master_vms_dir os os in
 
       (* Check that the ESD is writable. *)
       let testfile = mp // uuid // "v2v-write-test" in

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git