svn commit: r1227193 - /deltacloud/trunk/server/lib/deltacloud/server.rb

[mf...@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