Merged r3328 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3329 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/tasks/migrate_from_mantis.rake b/lib/tasks/migrate_from_mantis.rake
index 95722b12bc17fe4a8f5695fd53ddfe67f62b491f..594a7ec0e0e86f856af11663a9b903e45d950522 100644 (file)
--- a/lib/tasks/migrate_from_mantis.rake
+++ b/lib/tasks/migrate_from_mantis.rake
@@ -331,6 +331,7 @@ task :migrate_from_mantis => :environment do
        next unless i.save\r
        issues_map[bug.id] = i.id\r
        print '.'\r
+      STDOUT.flush\r
 \r
         # Assignee\r
         # Redmine checks that the assignee is a project member\r
@@ -378,6 +379,7 @@ task :migrate_from_mantis => :environment do
         r.issue_to = Issue.find_by_id(issues_map[relation.destination_bug_id])\r
         pp r unless r.save\r
         print '.'\r
+        STDOUT.flush\r
       end\r
       puts\r
       \r
@@ -393,6 +395,7 @@ task :migrate_from_mantis => :environment do
         n.author = User.find_by_id(users_map[news.poster_id])\r
         n.save\r
         print '.'\r
+        STDOUT.flush\r
       end\r
       puts\r
       \r
@@ -409,7 +412,7 @@ task :migrate_from_mantis => :environment do
                                  :is_required => field.require_report?\r
         next unless f.save\r
         print '.'\r
-        \r
+        STDOUT.flush\r
         # Trackers association\r
         f.trackers = Tracker.find :all\r
         \r
@@ -475,6 +478,7 @@ task :migrate_from_mantis => :environment do
   \r
   puts "WARNING: Your Redmine data will be deleted during this process."\r
   print "Are you sure you want to continue ? [y/N] "\r
+  STDOUT.flush\r
   break unless STDIN.gets.match(/^y$/i)\r
   \r
   # Default Mantis database settings\r
@@ -494,6 +498,7 @@ task :migrate_from_mantis => :environment do
     \r
   while true\r
     print "encoding [UTF-8]: "\r
+    STDOUT.flush\r
     encoding = STDIN.gets.chomp!\r
     encoding = 'UTF-8' if encoding.blank?\r
     break if MantisMigrate.encoding encoding\r

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 8c6838ae28eeebac3ff334c507a0aef78c36cc6a..dd129e4a5991b97671e66048530b3f5299d40ad4 100644 (file)
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -676,6 +676,7 @@ namespace :redmine do
           puts
           puts "This project already exists in your Redmine database."
           print "Are you sure you want to append data to this project ? [Y/n] "
+          STDOUT.flush
           exit if STDIN.gets.match(/^n$/i)
         end
         project.trackers << TRACKER_BUG unless project.trackers.include?(TRACKER_BUG)
@@ -726,6 +727,7 @@ namespace :redmine do
 
     puts "WARNING: a new project will be added to Redmine during this process."
     print "Are you sure you want to continue ? [y/N] "
+    STDOUT.flush
     break unless STDIN.gets.match(/^y$/i)
     puts
 
@@ -733,6 +735,7 @@ namespace :redmine do
       default = options[:default] || ''
       while true
         print "#{text} [#{default}]: "
+        STDOUT.flush
         value = STDIN.gets.chomp!
         value = default if value.blank?
         break if yield value