You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by Roman Semenenko <vo...@ginnungagap.in.ua> on 2010/08/29 17:31:01 UTC

[PATCH] a very quick fix for ruby-1.9.2 compatibility

---
 server/config.ru |    2 +-
 server/server.rb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/config.ru b/server/config.ru
index 6d37a5f..72cdfff 100644
--- a/server/config.ru
+++ b/server/config.ru
@@ -1,5 +1,5 @@
 require 'sinatra'
 require 'rubygems'
 
-require 'server.rb'
+require './server.rb'
 run Sinatra::Application
diff --git a/server/server.rb b/server/server.rb
index 1373fa3..9519b2d 100644
--- a/server/server.rb
+++ b/server/server.rb
@@ -1,5 +1,5 @@
 require 'sinatra'
-require 'deltacloud'
+require './deltacloud'
 require 'drivers'
 require 'json'
 require 'sinatra/respond_to'
-- 
1.7.2.2


Re: [PATCH] a very quick fix for ruby-1.9.2 compatibility

Posted by David Lutterkort <lu...@redhat.com>.
On Sun, 2010-08-29 at 18:31 +0300, Roman Semenenko wrote:
> ---
>  server/config.ru |    2 +-
>  server/server.rb |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Just to confirm: does this break in 1.9 because we assume that '.' is on
RUBYLIB ? If so, we need to adjust RUBYLIB (or $:), not patch these
files.

David