diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-01-27 10:50:19 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-01-27 10:50:19 +0000 |
| commit | 76432815103001089dc6a8df100391461881f707 (patch) | |
| tree | 1a3bf69663484fe5404fa1e96339abd1f1b591f0 /lib | |
| parent | fb663210b2e22e4511fbc63f395845a744755e58 (diff) | |
| download | redmine-76432815103001089dc6a8df100391461881f707.tar.gz redmine-76432815103001089dc6a8df100391461881f707.zip | |
undefined method `strip' for nil:NilClass error with JRuby 1.7.2 (#12228).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11278 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/scm/adapters/bazaar_adapter.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb index 72bb352b9..8de831d6c 100644 --- a/lib/redmine/scm/adapters/bazaar_adapter.rb +++ b/lib/redmine/scm/adapters/bazaar_adapter.rb @@ -104,13 +104,13 @@ module Redmine re = %r{^V\s+(#{Regexp.escape(prefix)})?(\/?)([^\/]+)(\/?)\s+(\S+)\r?$} io.each_line do |line| next unless line =~ re - name_locale = $3.strip + name_locale, slash, revision = $3.strip, $4, $5.strip name = scm_iconv('UTF-8', @path_encoding, name_locale) entries << Entry.new({:name => name, :path => ((path.empty? ? "" : "#{path}/") + name), - :kind => ($4.blank? ? 'file' : 'dir'), + :kind => (slash.blank? ? 'file' : 'dir'), :size => nil, - :lastrev => Revision.new(:revision => $5.strip) + :lastrev => Revision.new(:revision => revision) }) end end |