https://svn.lrde.epita.fr/svn/lrdetools/trunk
Index: ChangeLog
from Nicolas Pouillard <ertai(a)lrde.epita.fr>
Fix a bug with user configuration.
* vcs/lib/vcs/vcs.rb: No more convert non-string values.
vcs.rb | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
Index: vcs/lib/vcs/vcs.rb
--- vcs/lib/vcs/vcs.rb (revision 239)
+++ vcs/lib/vcs/vcs.rb (working copy)
@@ -378,7 +378,8 @@
def merge_user_conf ( conf )
conf = YAML.load(conf.read) if conf.is_a? Pathname
conf.each do |k, v|
- user_conf.send("#{k}=", (v.is_a? Array)? ((user_conf.send(k) || []) +
v) : v.to_s.to_sym)
+ v = v.to_sym if v.is_a? String
+ user_conf.send("#{k}=", (v.is_a? Array)? ((user_conf.send(k) || []) +
v) : v)
end
end