[PATCH] cli: bail out and propagate tagging errors in notmuch tag

[PATCH] cli: bail out and propagate tagging errors in notmuch tag

[Jani Nikula]

Checking and propagating tag_op_list_apply() errors is especially
important with batch tagging, as the processing of the batch input
would not stop otherwise. Additionally this sets the exit code, which
is useful in scripts.
---
 notmuch-tag.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 4272426..16b1668 100644
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -97,6 +97,7 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,
     notmuch_query_t *query;
     notmuch_messages_t *messages;
     notmuch_message_t *message;
+    int ret = 0;
 
     /* Optimize the query so it excludes messages that already have
      * the specified set of tags. */
@@ -119,13 +120,15 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,
 	 notmuch_messages_valid (messages) && ! interrupted;
 	 notmuch_messages_move_to_next (messages)) {
 	message = notmuch_messages_get (messages);
-	tag_op_list_apply (message, tag_ops, flags | TAG_FLAG_PRE_OPTIMIZED);
+	ret = tag_op_list_apply (message, tag_ops, flags | TAG_FLAG_PRE_OPTIMIZED);
 	notmuch_message_destroy (message);
+	if (ret)
+	    break;
     }
 
     notmuch_query_destroy (query);
 
-    return interrupted;
+    return ret || interrupted;
 }
 
 static int
-- 
1.7.10.4

Re: [PATCH] cli: bail out and propagate tagging errors in notmuch tag

[Tomi Ollila]

On Tue, Jan 08 2013, Jani Nikula wrote:

> Checking and propagating tag_op_list_apply() errors is especially
> important with batch tagging, as the processing of the batch input
> would not stop otherwise. Additionally this sets the exit code, which
> is useful in scripts.
> ---

LGTM.

Tomi


>  notmuch-tag.c |    7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/notmuch-tag.c b/notmuch-tag.c
> index 4272426..16b1668 100644
> --- a/notmuch-tag.c
> +++ b/notmuch-tag.c
> @@ -97,6 +97,7 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,
>      notmuch_query_t *query;
>      notmuch_messages_t *messages;
>      notmuch_message_t *message;
> +    int ret = 0;
>  
>      /* Optimize the query so it excludes messages that already have
>       * the specified set of tags. */
> @@ -119,13 +120,15 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,
>  	 notmuch_messages_valid (messages) && ! interrupted;
>  	 notmuch_messages_move_to_next (messages)) {
>  	message = notmuch_messages_get (messages);
> -	tag_op_list_apply (message, tag_ops, flags | TAG_FLAG_PRE_OPTIMIZED);
> +	ret = tag_op_list_apply (message, tag_ops, flags | TAG_FLAG_PRE_OPTIMIZED);
>  	notmuch_message_destroy (message);
> +	if (ret)
> +	    break;
>      }
>  
>      notmuch_query_destroy (query);
>  
> -    return interrupted;
> +    return ret || interrupted;
>  }
>  
>  static int
> -- 
> 1.7.10.4
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH] cli: bail out and propagate tagging errors in notmuch tag

[David Bremner]

Jani Nikula <jani@nikula.org> writes:
> +	if (ret)
> +	    break;

I amended this to (ret != NOTMUCH_STATUS_SUCCESS) 

There are a few different families of status codes flying around here,
and I liked the extra documentation.

d

Re: [PATCH] cli: bail out and propagate tagging errors in notmuch tag

[Tomi Ollila]

On Thu, Jan 10 2013, David Bremner <david@tethera.net> wrote:

> Jani Nikula <jani@nikula.org> writes:
>> +	if (ret)
>> +	    break;
>
> I amended this to (ret != NOTMUCH_STATUS_SUCCESS) 
>
> There are a few different families of status codes flying around here,
> and I liked the extra documentation.

That sure is a good point, should follow-up patch do this:

-    int ret = 0;
+    int ret = NOTMUCH_STATUS_SUCCESS;

?

> d

Tomi

Re: [PATCH] cli: bail out and propagate tagging errors in notmuch tag

[David Bremner]

Tomi Ollila <tomi.ollila@iki.fi> writes:
>
> That sure is a good point, should follow-up patch do this:
>
> -    int ret = 0;
> +    int ret = NOTMUCH_STATUS_SUCCESS;
>

sure.

d

[PATCH] notmuch-tag: initialize with enum instead of 0.

[david]

From: David Bremner <bremner@debian.org>

This is just a cosmetic fix to make the "type" of ret more clear.
---
 notmuch-tag.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/notmuch-tag.c b/notmuch-tag.c
index b54c55d..d9daf8f 100644
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -97,7 +97,7 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,
     notmuch_query_t *query;
     notmuch_messages_t *messages;
     notmuch_message_t *message;
-    int ret = 0;
+    int ret = NOTMUCH_STATUS_SUCCESS;
 
     /* Optimize the query so it excludes messages that already have
      * the specified set of tags. */
-- 
1.7.10.4

Re: [PATCH] notmuch-tag: initialize with enum instead of 0.

[Tomi Ollila]

On Sat, Jan 19 2013, david@tethera.net wrote:

> From: David Bremner <bremner@debian.org>
>
> This is just a cosmetic fix to make the "type" of ret more clear.
> ---
>  notmuch-tag.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/notmuch-tag.c b/notmuch-tag.c
> index b54c55d..d9daf8f 100644
> --- a/notmuch-tag.c
> +++ b/notmuch-tag.c
> @@ -97,7 +97,7 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,
>      notmuch_query_t *query;
>      notmuch_messages_t *messages;
>      notmuch_message_t *message;
> -    int ret = 0;
> +    int ret = NOTMUCH_STATUS_SUCCESS;

LGTM.

Tomi

Re: [PATCH] notmuch-tag: initialize with enum instead of 0.

[David Bremner]

david@tethera.net writes:

> From: David Bremner <bremner@debian.org>
>
> This is just a cosmetic fix to make the "type" of ret more clear.

Pushed. I even caught the '.' and the end of the commit subject.
No idea why that is so hard for me.

d