Fix bug in multiple-ecology-file-detection code

ooyala · Oct 21, 2011 · 9f92cc6 · 9f92cc6
1 parent 761e4fb
commit 9f92cc6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/ecology.rb b/lib/ecology.rb
@@ -40,7 +40,7 @@ def read(ecology_pathname = nil)
       }
 
       if @ecology_initialized
-        if ecology_path != @ecology_path
+        if ecology_path != nil && ecology_path != @ecology_path
           raise "You've tried to load both #{ecology_path || "nothing"} and " +
             "#{@ecology_path || "nothing"} as ecology files since last reset!"
         end