Return-Path: X-Original-To: apmail-deltacloud-commits-archive@www.apache.org Delivered-To: apmail-deltacloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8A053BCE8 for ; Wed, 4 Jan 2012 15:47:37 +0000 (UTC) Received: (qmail 8382 invoked by uid 500); 4 Jan 2012 15:47:37 -0000 Delivered-To: apmail-deltacloud-commits-archive@deltacloud.apache.org Received: (qmail 8363 invoked by uid 500); 4 Jan 2012 15:47:37 -0000 Mailing-List: contact commits-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list commits@deltacloud.apache.org Received: (qmail 8353 invoked by uid 99); 4 Jan 2012 15:47:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jan 2012 15:47:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jan 2012 15:47:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AA26B2388993 for ; Wed, 4 Jan 2012 15:47:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1227193 - /deltacloud/trunk/server/lib/deltacloud/server.rb Date: Wed, 04 Jan 2012 15:47:15 -0000 To: commits@deltacloud.apache.org From: mfojtik@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120104154715.AA26B2388993@eris.apache.org> Author: mfojtik Date: Wed Jan 4 15:47:15 2012 New Revision: 1227193 URL: http://svn.apache.org/viewvc?rev=1227193&view=rev Log: Core: Removed annoying warning about public vs public_folder Modified: deltacloud/trunk/server/lib/deltacloud/server.rb Modified: deltacloud/trunk/server/lib/deltacloud/server.rb URL: http://svn.apache.org/viewvc/deltacloud/trunk/server/lib/deltacloud/server.rb?rev=1227193&r1=1227192&r2=1227193&view=diff ============================================================================== --- deltacloud/trunk/server/lib/deltacloud/server.rb (original) +++ deltacloud/trunk/server/lib/deltacloud/server.rb Wed Jan 4 15:47:15 2012 @@ -50,7 +50,11 @@ configure do set :views, File::join($top_srcdir, 'views') # NOTE: Change :public to :public_folder once we update sinatra to 1.3 # set :public_folder, File::join($top_srcdir, 'public') - set :public, File::join($top_srcdir, 'public') + if settings.respond_to? :public_folder + set :public_folder, File::join($top_srcdir, 'public') + else + set :public, File::join($top_srcdir, 'public') + end # Try to load the driver on startup to fail early if there are issues driver end