From: František Dvořák Date: Thu, 18 Sep 2014 10:43:18 +0000 (+0200) Subject: Fix bundler killer patch. X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=577499264292598f18e4b1775249f3bb20b1effc;p=rOCCI-packaging-fedora.git Fix bundler killer patch. --- diff --git a/rocci-server-unbundle.diff b/rocci-server-unbundle.diff index f4ca918..8d4000d 100644 --- a/rocci-server-unbundle.diff +++ b/rocci-server-unbundle.diff @@ -1,4 +1,3 @@ -commit 6472c939703f3a9a64c669a2fd826ad2a98e8bdd Author: FrantiÅ¡ek Dvořák Date: Thu Sep 18 00:47:31 2014 +0200 @@ -18,7 +17,7 @@ index 98480fb..268b1ca 100644 +require 'rails' +require 'rails-api' +require 'jbuilder' -+require 'rack-cors' ++require 'rack/cors' +require 'passenger' +require 'dalli' +require 'kgio' @@ -30,14 +29,14 @@ index 98480fb..268b1ca 100644 +# ec2 backend +begin + require 'aws-sdk-core' -+rescue ++rescue LoadError +end +# opennebula backend +begin + require 'opennebula' + require 'erubis' + require 'ox' -+rescue ++rescue LoadError +end # Extend Object with #deep_freeze