summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-22 06:07:19 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-22 06:07:19 +0000
commit219f68abfeb4a42ff6eac89e550a8b98bde08cb3 (patch)
treec0f1e3b276571259015ba50f686633210bc300bf
parent696adbccd3a45e0c5dbad41c6e12a656c46c5958 (diff)
* tool/redmine-backporter.rb: the fullpath of merger.rb is too long to
copy&paste on Windows. show shorter name instead on the platform. I'm sure that the user of this command on Windows is only me. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54679 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rwxr-xr-xtool/redmine-backporter.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c1cee9..b6d2f3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 22 15:04:56 2016 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * tool/redmine-backporter.rb: the fullpath of merger.rb is too long to
+ copy&paste on Windows. show shorter name instead on the platform.
+ I'm sure that the user of this command on Windows is only me.
+
Fri Apr 22 14:52:04 2016 NAKAMURA Usaku <usa@ruby-lang.org>
* tool/merger.rb: remove temporary file.
diff --git a/tool/redmine-backporter.rb b/tool/redmine-backporter.rb
index 0806e63..01ec042 100755
--- a/tool/redmine-backporter.rb
+++ b/tool/redmine-backporter.rb
@@ -300,7 +300,7 @@ def show_last_journal(http, uri)
end
def merger_path
- File.expand_path('../merger.rb', __FILE__)
+ RUBY_PLATFORM =~ /mswin|mingw/ ? 'merger' : File.expand_path('../merger.rb', __FILE__)
end
def backport_command_string