From 6a8dc735d30d39e4424855623f0db4fb1afbc76f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 1 May 2010 09:56:59 +0000 Subject: [PATCH] Fixes Bazaar adapter for JRuby/Win32 (#5404). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3723 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/bazaar_adapter.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb index ed240bf3..3c6bdf54 100644 --- a/lib/redmine/scm/adapters/bazaar_adapter.rb +++ b/lib/redmine/scm/adapters/bazaar_adapter.rb @@ -30,7 +30,7 @@ module Redmine cmd = "#{BZR_BIN} revno #{target('')}" info = nil shellout(cmd) do |io| - if io.read =~ %r{^(\d+)$} + if io.read =~ %r{^(\d+)\r?$} info = Info.new({:root_url => url, :lastrev => Revision.new({ :identifier => $1 @@ -56,7 +56,7 @@ module Redmine shellout(cmd) do |io| prefix = "#{url}/#{path}".gsub('\\', '/') logger.debug "PREFIX: #{prefix}" - re = %r{^V\s+(#{Regexp.escape(prefix)})?(\/?)([^\/]+)(\/?)\s+(\S+)$} + re = %r{^V\s+(#{Regexp.escape(prefix)})?(\/?)([^\/]+)(\/?)\s+(\S+)\r?$} io.each_line do |line| next unless line =~ re entries << Entry.new({:name => $3.strip,