lib/docman/docroot_config.rb in docman-0.0.70 vs lib/docman/docroot_config.rb in docman-0.0.71

- old
+ new

@@ -9,20 +9,20 @@ def initialize(docroot_dir, deploy_target = nil) @docroot_dir = docroot_dir @deploy_target = deploy_target @docroot_config_dir = File.join(docroot_dir, 'config') - update + update(' origin master') if File.file? File.join(@docroot_config_dir, 'config.yaml') Docman::Application.instance.config.merge_config_from_file(File.join(@docroot_config_dir, 'config.yaml')) end @names = {} @raw_infos = {} @structure = structure_build File.join(@docroot_config_dir, 'master') end - def update - GitUtil.update @docroot_config_dir + def update(options = '') + GitUtil.update @docroot_config_dir, options end def structure_build(path, prefix = '', parent = nil) return unless File.file? File.join(path, 'info.yaml') \ No newline at end of file