github-migration
/
hydra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Dishwasha/hydra into Dishwasha-master

This commit is contained in:
Nick Gauthier 2011-03-22 19:23:02 -04:00
parent 51af3385ea 52e06ccffc
commit 430c7f9a59
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/hydra/tasks.rb
View File

@ -36,6 +36,8 @@ module Hydra #:nodoc:
# files that may not play nice with others. # files that may not play nice with others.
attr_accessor :serial attr_accessor :serial
attr_accessor :environment
# #
# Search for the hydra config file # Search for the hydra config file
def find_config_file def find_config_file
@ -91,7 +93,8 @@ module Hydra #:nodoc:
:verbose => @verbose, :verbose => @verbose,
:autosort => @autosort, :autosort => @autosort,
:files => @files, :files => @files,
:listeners => @listeners :listeners => @listeners,
:environment => @environment
} }
if @config if @config
@opts.merge!(:config => @config) @opts.merge!(:config => @config)