deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@apache.org
Subject [1/2] git commit: Core: Do not use require_relative when full path is given
Date Thu, 13 Dec 2012 13:00:54 GMT
Updated Branches:
  refs/heads/master cf7d25e2f -> c101ed456


Core: Do not use require_relative when full path is given

(this cause jRuby fail to require CIMI collections)


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/c101ed45
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/c101ed45
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/c101ed45

Branch: refs/heads/master
Commit: c101ed4569d8a58500b1aa8ce5fb2d0dc96fd7df
Parents: 54ed59c
Author: Michal Fojtik <mfojtik@redhat.com>
Authored: Thu Dec 13 13:57:47 2012 +0100
Committer: Michal fojtik <mfojtik@redhat.com>
Committed: Thu Dec 13 13:57:47 2012 +0100

----------------------------------------------------------------------
 server/lib/cimi/collections.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/c101ed45/server/lib/cimi/collections.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/collections.rb b/server/lib/cimi/collections.rb
index a4e9ab9..67527fb 100644
--- a/server/lib/cimi/collections.rb
+++ b/server/lib/cimi/collections.rb
@@ -39,7 +39,7 @@ module CIMI
     Dir[File.join(File::dirname(__FILE__), "collections", "*.rb")].each do |collection|
       base_collection_name = File.basename(collection).gsub('.rb', '')
       next if base_collection_name == 'base'
-      require_relative collection
+      require collection
       cimi_module_class = CIMI::Collections.const_get(base_collection_name.camelize)
       cimi_modules << cimi_module_class
       unless cimi_module_class.collections.nil?


Mime
View raw message