[mutt] 01/01: neomutt-devel/837212-fix-duplicate-saved-messages.patch: do not save tagged messages twice (Closes: 837212).

[Antonio Radici]

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

antonio pushed a commit to branch master
in repository mutt.

commit 8763fdee3cd1311439b024cd95e826f067c6c72c
Author: Antonio Radici <antonio at debian.org>
Date:   Sat Sep 10 08:11:04 2016 +0100

    neomutt-devel/837212-fix-duplicate-saved-messages.patch: do not save tagged messages twice (Closes: 837212).
---
 debian/changelog                                   |  8 ++++
 .../837212-fix-duplicate-saved-messages.patch      | 49 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 58 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4ccfbfb..39346d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mutt (1.7.0-3) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    + neomutt-devel/837212-fix-duplicate-saved-messages.patch: do not save
+      tagged messages twice (Closes: 837212).
+
+ -- Antonio Radici <antonio at debian.org>  Sat, 10 Sep 2016 08:10:02 +0100
+
 mutt (1.7.0-2) unstable; urgency=medium
 
   * debian/patches:
diff --git a/debian/patches/neomutt-devel/837212-fix-duplicate-saved-messages.patch b/debian/patches/neomutt-devel/837212-fix-duplicate-saved-messages.patch
new file mode 100644
index 0000000..aa70119
--- /dev/null
+++ b/debian/patches/neomutt-devel/837212-fix-duplicate-saved-messages.patch
@@ -0,0 +1,49 @@
+From 57c97aaa4fe94884c59dac74e0643ca629f52d1f Mon Sep 17 00:00:00 2001
+From: Richard Russon <rich at flatcap.org>
+Date: Sat, 3 Sep 2016 12:06:28 +0100
+Subject: [PATCH] fix duplicate saved messages
+
+This issue only affected local mailboxes.
+
+When tagged messages were saved to another mailbox, two copies of each
+mail appeared.  This was due to a bad merge leaving two "save message"
+commands.
+
+Fixes #129
+---
+ commands.c | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/commands.c b/commands.c
+index 839d8aa..6daf2c1 100644
+--- a/commands.c
++++ b/commands.c
+@@ -893,12 +893,9 @@ int mutt_save_message (HEADER *h, int delete,
+ 	if (Context->hdrs[Context->v2r[i]]->tagged)
+ 	{
+ 	  mutt_message_hook (Context, Context->hdrs[Context->v2r[i]], MUTT_MESSAGEHOOK);
+-	  if (_mutt_save_message(Context->hdrs[Context->v2r[i]],
+-			     &ctx, delete, decode, decrypt) != 0)
+-          {
+-            mx_close_mailbox (&ctx, NULL);
+-            return -1;
+-          }
++	  if ((rc = _mutt_save_message(Context->hdrs[Context->v2r[i]],
++			     &ctx, delete, decode, decrypt) != 0))
++	    break;
+ #ifdef USE_COMPRESSED
+           if (cm)
+           {
+@@ -910,9 +907,6 @@ int mutt_save_message (HEADER *h, int delete,
+               cm->msg_flagged++;
+           }
+ #endif
+-	  if ((rc = _mutt_save_message(Context->hdrs[Context->v2r[i]],
+-			     &ctx, delete, decode, decrypt) != 0))
+-	    break;
+ 	}
+       }
+ #ifdef USE_NOTMUCH
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 2f7e3aa..6e30694 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@ neomutt-devel/sensible-browser.patch
 neomutt-devel/832971-reset-xlabel.patch
 neomutt-devel/836812-user-agent-temp-fix.patch
 neomutt-devel/834448-restore-i-pager-binding.patch
+neomutt-devel/837212-fix-duplicate-saved-messages.patch
 debian-specific/Muttrc.patch
 debian-specific/Md.etc_mailname_gethostbyname.patch
 debian-specific/use_usr_bin_editor.patch

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