From: Sascha Silbe <sascha-pgp@silbe.org>
To: sup-devel <sup-devel@rubyforge.org>
Subject: [sup-devel] [PATCH] poll: fix message update vs. already-imported detection
Date: Tue, 18 Jan 2011 19:24:27 +0100 [thread overview]
Message-ID: <1295375067-2184-1-git-send-email-sascha-pgp@silbe.org> (raw)
poll_from prepends existing locations to the "new" message, so we can't use
just the first location.
While using the last location would work, calculating the difference should be
fast and is more robust in the face of future changes to poll_from.
Signed-off-by: Sascha Silbe <sascha-pgp@silbe.org>
---
lib/sup/poll.rb | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/sup/poll.rb b/lib/sup/poll.rb
index afd3d95..7e05292 100644
--- a/lib/sup/poll.rb
+++ b/lib/sup/poll.rb
@@ -115,10 +115,11 @@ EOS
yield "Deleting #{m.id}"
elsif action == :add
if old_m
- if not old_m.locations.member? m.location
- yield "Message at #{m.source_info} is an updated of an old message. Updating labels from #{old_m.labels.to_a * ','} => #{m.labels.to_a * ','}"
+ new_locations = (m.locations - old_m.locations)
+ if not new_locations.empty?
+ yield "Message at #{new_locations[0].info} is an update of an old message. Updating labels from #{old_m.labels.to_a * ','} => #{m.labels.to_a * ','}"
else
- yield "Skipping already-imported message at #{m.source_info}"
+ yield "Skipping already-imported message at #{m.locations[-1].info}"
end
else
yield "Found new message at #{m.source_info} with labels #{m.labels.to_a * ','}"
--
1.7.2.3
_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel
next reply other threads:[~2011-01-18 19:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-18 18:24 Sascha Silbe [this message]
2011-01-19 3:39 ` Rich Lane
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1295375067-2184-1-git-send-email-sascha-pgp@silbe.org \
--to=sascha-pgp@silbe.org \
--cc=sascha-ml-reply-to-2011-1@silbe.org \
--cc=sup-devel@rubyforge.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox