summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-01-23 17:25:11 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-01-23 17:25:11 +0000
commit91dc13f4b22c45bee5cfd1d783d6544ae79afa04 (patch)
treeb57967d4dcb3afbf1fdcb1d6ee4c8bf58e7cf41c /lib
parent97e7432ce6da80dea633cd99e934943925a774b5 (diff)
downloadredmine-91dc13f4b22c45bee5cfd1d783d6544ae79afa04.tar.gz
redmine-91dc13f4b22c45bee5cfd1d783d6544ae79afa04.zip
Show explicit error message when the scm command failed (eg. when svn binary is not available).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1094 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/scm/adapters/abstract_adapter.rb2
-rw-r--r--lib/redmine/scm/adapters/subversion_adapter.rb1
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 633637ab4..5db4964e9 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -120,7 +120,7 @@ module Redmine
rescue Errno::ENOENT => e
# The command failed, log it and re-raise
logger.error("SCM command failed: #{cmd}\n with: #{e.message}")
- raise CommandFailed
+ raise CommandFailed.new(e.message)
end
end
end
diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb
index f698f4a62..5b6bfa97c 100644
--- a/lib/redmine/scm/adapters/subversion_adapter.rb
+++ b/lib/redmine/scm/adapters/subversion_adapter.rb
@@ -66,7 +66,6 @@ module Redmine
entries = Entries.new
cmd = "#{SVN_BIN} list --xml #{target(path)}@#{identifier}"
cmd << credentials_string
- cmd << " 2>&1"
shellout(cmd) do |io|
output = io.read
begin