Fixes Bazaar adapter for JRuby/Win32 (#5404).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3723 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixes Bazaar adapter for JRuby/Win32 (#5404).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3723 e93f8b46-1217-0410-a6f0-8f06a7374b81
6a8dc735 · Jean-Philippe Lang · b8970897 · 6a8dc735
Commit 6a8dc735 authored May 01, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

bazaar_adapter.rb lib/redmine/scm/adapters/bazaar_adapter.rb +2 -2

No files found.
--- 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,