summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2007-09-30 17:38:07 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2007-09-30 17:38:07 +0000
commitc2220cffcfbf3eec00f7eee62a55242bf4ede7ae (patch)
tree94bd6fc18598dc6b104d58252e962a205f281ce6
parent3e86dde31e9726cb22a39d236286956e10b45b82 (diff)
downloadredmine-c2220cffcfbf3eec00f7eee62a55242bf4ede7ae.tar.gz
redmine-c2220cffcfbf3eec00f7eee62a55242bf4ede7ae.zip
Added svn command output to error log when SubversionAdapter#entries parsing fails.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@780 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--lib/redmine/scm/adapters/subversion_adapter.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb
index eecb34c2c..c9a73ddda 100644
--- a/lib/redmine/scm/adapters/subversion_adapter.rb
+++ b/lib/redmine/scm/adapters/subversion_adapter.rb
@@ -66,9 +66,11 @@ module Redmine
entries = Entries.new
cmd = "#{SVN_BIN} list --xml #{target(path)}@#{identifier}"
cmd << " --username #{@login} --password #{@password}" if @login
+ cmd << " 2>&1"
shellout(cmd) do |io|
+ output = io.read
begin
- doc = REXML::Document.new(io)
+ doc = REXML::Document.new(output)
doc.elements.each("lists/list/entry") do |entry|
entries << Entry.new({:name => entry.elements['name'].text,
:path => ((path.empty? ? "" : "#{path}/") + entry.elements['name'].text),
@@ -82,7 +84,8 @@ module Redmine
})
end
rescue Exception => e
- logger.info("Error parsing svn output: #{e.message}")
+ logger.error("Error parsing svn output: #{e.message}")
+ logger.error("Output was:\n #{output}")
end
end
return nil if $? && $?.exitstatus != 0