[libvirt] [PATCH 11/12] storage_conf: Improve error messages

[Ján Tomko]

On 05/22/2013 02:05 PM, Osier Yang wrote:
> virStoragePoolDefParseSource:
>   * Better error message
> 
> virStoragePoolObjLoad:
>   * Break the line line
> ---
>  src/conf/storage_conf.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
> index 44ecb2a..a62629e 100644
> --- a/src/conf/storage_conf.c
> +++ b/src/conf/storage_conf.c
> @@ -531,7 +531,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt,
>      source->name = virXPathString("string(./name)", ctxt);
>      if (pool_type == VIR_STORAGE_POOL_RBD && source->name == NULL) {
>          virReportError(VIR_ERR_XML_ERROR, "%s",
> -                       _("missing mandatory 'name' field for RBD pool name"));
> +                       _("element 'name' is mandatory for RBD pool name"));

s/pool name/pools/

>          goto cleanup;
>      }
>  
> @@ -1695,7 +1695,8 @@ virStoragePoolObjLoad(virStoragePoolObjListPtr pools,
>  
>      if (!virFileMatchesNameSuffix(file, def->name, ".xml")) {
>          virReportError(VIR_ERR_XML_ERROR,
> -                       _("Storage pool config filename '%s' does not match pool name '%s'"),
> +                       _("Storage pool config filename '%s' does "
> +                         "not match pool name '%s'"),
>                         path, def->name);
>          virStoragePoolDefFree(def);
>          return NULL;
> 

ACK

Jan