From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.213.7.146 with SMTP id d18cs111079ebd; Wed, 13 Jan 2010 10:24:15 -0800 (PST) Received: by 10.224.123.213 with SMTP id q21mr836170qar.225.1263407052440; Wed, 13 Jan 2010 10:24:12 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id 8si15571592qwj.53.2010.01.13.10.24.11; Wed, 13 Jan 2010 10:24:12 -0800 (PST) Received-SPF: pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id 8E70118582DF; Wed, 13 Jan 2010 13:24:11 -0500 (EST) X-Greylist: delayed 427 seconds by postgrey-1.31 at rubyforge.org; Wed, 13 Jan 2010 13:21:22 EST Received: from smtp-outbound-2.vmware.com (smtp-outbound-2.vmware.com [65.115.85.73]) by rubyforge.org (Postfix) with ESMTP id 8BD8A18582DF for ; Wed, 13 Jan 2010 13:21:22 -0500 (EST) Received: from mailhost3.vmware.com (mailhost3.vmware.com [10.16.27.45]) by smtp-outbound-2.vmware.com (Postfix) with ESMTP id 0B88225077 for ; Wed, 13 Jan 2010 10:14:11 -0800 (PST) Received: from rlane-desktop.eng.vmware.com (rlane-desktop.eng.vmware.com [10.20.118.202]) by mailhost3.vmware.com (Postfix) with ESMTP id F381CCD908; Wed, 13 Jan 2010 10:14:10 -0800 (PST) Received: from rlane by rlane-desktop.eng.vmware.com with local (Exim 4.69) (envelope-from ) id 1NV7jO-00073N-Sx; Wed, 13 Jan 2010 10:14:10 -0800 From: Rich Lane To: sup-devel@rubyforge.org Date: Wed, 13 Jan 2010 10:13:40 -0800 Message-Id: <1263406420-27036-1-git-send-email-rlane@club.cc.cmu.edu> X-Mailer: git-send-email 1.6.3.3 Cc: Rich Lane Subject: [sup-devel] [PATCH] fix ask_for_contacts on Ruby 1.9 X-BeenThere: sup-devel@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Sup developer discussion List-Id: Sup developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org From: Rich Lane String doesn't respond to :map anymore. The previous code was also joining with " " instead of ", ", which was broken. --- lib/sup/buffer.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/sup/buffer.rb b/lib/sup/buffer.rb index c826ab9..990dd4a 100644 --- a/lib/sup/buffer.rb +++ b/lib/sup/buffer.rb @@ -537,7 +537,7 @@ EOS end def ask_for_contacts domain, question, default_contacts=[] - default = default_contacts.map { |s| s.to_s }.join(" ") + default = default_contacts.is_a?(String) ? default_contacts : default_contacts.map { |s| s.to_s }.join(", ") default += " " unless default.empty? recent = Index.load_contacts(AccountManager.user_emails, :num => 10).map { |c| [c.full_address, c.email] } -- 1.6.3.3 _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel