Only error out if Rails.env differs from options.environment

limhoff-r7 · limhoff-r7 · commit f9ab7f7a8869 · 2014-07-31T13:28:21.000-05:00
MSP-10964
diff --git a/lib/metasploit/framework/parsed_options/base.rb b/lib/metasploit/framework/parsed_options/base.rb
@@ -57,7 +57,7 @@ def configure(application)
   #
   # @return [void]
   def environment!
-    if defined?(Rails) && Rails.instance_variable_defined?(:@_env)
+    if defined?(Rails) && Rails.instance_variable_defined?(:@_env) && Rails.env != options.environment
       raise "#{self.class}##{__method__} called too late to set RAILS_ENV: Rails.env already memoized"
     end
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ def configure(application)`
`57`	`57`	`#`
`58`	`58`	`# @return [void]`
`59`	`59`	`def environment!`
`60`		`- if defined?(Rails) && Rails.instance_variable_defined?(:@_env)`
	`60`	`+ if defined?(Rails) && Rails.instance_variable_defined?(:@_env) && Rails.env != options.environment`
`61`	`61`	`raise "#{self.class}##{__method__} called too late to set RAILS_ENV: Rails.env already memoized"`
`62`	`62`	`end`
`63`	`63`