From a7b2236d3a77fd268ffa9b76ee2c04a8e8f9e348 Mon Sep 17 00:00:00 2001 From: Saku Ytti Date: Fri, 11 Jul 2014 18:06:46 +0300 Subject: support local models if ~/.config/oxidized/model/ios.rb exists it is used, iinstead of the system-wide model --- lib/oxidized/manager.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/oxidized/manager.rb b/lib/oxidized/manager.rb index 251f0cc..b4eaecd 100644 --- a/lib/oxidized/manager.rb +++ b/lib/oxidized/manager.rb @@ -41,7 +41,9 @@ module Oxidized @output.merge! method end def add_model _model - _model = Manager.load Config::ModelDir, _model + name = _model + _model = Manager.load File.join(Config::Root, 'model'), name + _model = Manager.load Config::ModelDir, name if _model.empty? return false if _model.empty? @model.merge! _model end -- cgit v1.2.1