From: Rich Lane <rlane@club.cc.cmu.edu>
To: sup-devel@rubyforge.org
Subject: [sup-devel] [PATCH] ruby 1.9: expect nil start_offset when an MBox::Loader is first created
Date: Fri, 1 Jan 2010 14:14:00 -0800 [thread overview]
Message-ID: <1262384040-27801-1-git-send-email-rlane@club.cc.cmu.edu> (raw)
Various callers (including sup-add) passed a nil start_offset. Through a
convoluted path probably involving the fact that nil.to_i == 0, this did the
right thing on Ruby 1.8. It crashes on 1.9, so change initialize to expect a
nil offset and replace it with 0.
---
lib/sup/mbox/loader.rb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/lib/sup/mbox/loader.rb b/lib/sup/mbox/loader.rb
index 520e2ec..54d227d 100644
--- a/lib/sup/mbox/loader.rb
+++ b/lib/sup/mbox/loader.rb
@@ -12,7 +12,7 @@ class Loader < Source
attr_reader :labels
## uri_or_fp is horrific. need to refactor.
- def initialize uri_or_fp, start_offset=0, usual=true, archived=false, id=nil, labels=nil
+ def initialize uri_or_fp, start_offset=nil, usual=true, archived=false, id=nil, labels=nil
@mutex = Mutex.new
@labels = Set.new((labels || []) - LabelManager::RESERVED_LABELS)
@@ -29,6 +29,7 @@ class Loader < Source
@path = uri_or_fp.path
end
+ start_offset ||= 0
super uri_or_fp, start_offset, usual, archived, id
end
--
1.6.3.3
_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel
next reply other threads:[~2010-01-01 22:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-01 22:14 Rich Lane [this message]
2010-01-03 15:00 ` William Morgan
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=1262384040-27801-1-git-send-email-rlane@club.cc.cmu.edu \
--to=rlane@club.cc.cmu.edu \
--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